summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* UI consistency: allow --force for where -f means forceRené Scharfe2009-08-2910-5/+11
* update-server-info: make builtin, use parseoptRené Scharfe2009-08-295-29/+28
* Draft release notes to 1.6.5 before -rc0Junio C Hamano2009-08-281-1/+59
* Merge branch 'mm/reset-report'Junio C Hamano2009-08-285-15/+31
|\
| * reset: make the reminder output consistent with "checkout"Matthieu Moy2009-08-215-11/+27
| * Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.Matthieu Moy2009-08-214-5/+5
* | Merge branch 'jk/maint-1.6.3-checkout-unborn'Junio C Hamano2009-08-282-9/+43
|\ \
| * | checkout: do not imply "-f" on unborn branchesJeff King2009-08-252-9/+43
* | | Merge branch 'np/maint-1.6.3-deepen'Junio C Hamano2009-08-282-1/+62
|\ \ \
| * | | fix simple deepening of a repoNicolas Pitre2009-08-242-2/+61
| |/ /
* | | Merge branch 'jc/shortstatus'Junio C Hamano2009-08-286-230/+550
|\ \ \
| * | | git commit --dry-run -v: show diff in color when askedJunio C Hamano2009-08-151-2/+4
| * | | Documentation/git-commit.txt: describe --dry-runJunio C Hamano2009-08-151-4/+9
| * | | wt-status: collect untracked files in a separate "collect" phaseJunio C Hamano2009-08-102-23/+38
| * | | Make git_status_config() file scope static to builtin-commit.cJunio C Hamano2009-08-103-61/+60
| * | | wt-status: move wt_status_colors[] into wt_status structureJunio C Hamano2009-08-102-5/+8
| * | | wt-status: move many global settings to wt_status structureJunio C Hamano2009-08-103-84/+93
| * | | commit: --dry-runJunio C Hamano2009-08-072-14/+22
| * | | status: show worktree status of conflicted paths separatelyJunio C Hamano2009-08-063-3/+120
| * | | wt-status.c: rework the way changes to the index and work tree are summarizedJunio C Hamano2009-08-063-50/+199
| * | | diff-index: keep the original index intactJunio C Hamano2009-08-051-18/+0
| * | | diff-index: report unmerged new entriesJunio C Hamano2009-08-052-2/+33
* | | | Merge branch 'maint'Junio C Hamano2009-08-281-1/+6
|\ \ \ \
| * \ \ \ Merge branch 'rc/maint-http-fix' into maintJunio C Hamano2009-08-281-1/+3
| |\ \ \ \
| * | | | | http.c: set slot callback members to NULL when releasing objectTay Ray Chuan2009-08-281-1/+6
* | | | | | t/test-lib.sh: provide a shell implementation of the 'yes' utilityBrandon Casey2009-08-281-0/+15
* | | | | | Merge branch 'maint'Junio C Hamano2009-08-274-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-274-4/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-08-274-4/+4
| | |\ \ \ \ \
| | | * | | | | Fix overridable written with an extra 'e'Nanako Shiraishi2009-08-272-2/+2
| | | * | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-08-271-1/+1
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-271-1/+1
| | | | |\ \ \ \ \
| | | | | * | | | | Documentation: git-archive: mark --format as optional in summaryWesley J. Landaker2009-08-271-1/+1
| | | | | * | | | | Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano2009-08-272-2/+43
| | | | | |\ \ \ \ \
| | | * | | | | | | | Round-down years in "years+months" relative date viewDavid Reiss2009-08-271-1/+1
* | | | | | | | | | | Merge branch 'lt/block-sha1'Junio C Hamano2009-08-2711-531/+54
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove ARM and Mozilla SHA1 implementationsNicolas Pitre2009-08-189-526/+11
| * | | | | | | | | | | block-sha1: guard gcc extensions with __GNUC__Nicolas Pitre2009-08-181-2/+2
| * | | | | | | | | | | make sure byte swapping is optimal for gitNicolas Pitre2009-08-183-2/+40
| * | | | | | | | | | | block-sha1: make the size member first in the context structNicolas Pitre2009-08-181-1/+1
* | | | | | | | | | | | Merge branch 'as/maint-graph-interesting-fix'Junio C Hamano2009-08-275-5/+325
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add tests for rev-list --graph with options that simplify historyAdam Simpkins2009-08-241-0/+276
| * | | | | | | | | | | | graph API: fix bug in graph_is_interesting()Adam Simpkins2009-08-214-5/+49
* | | | | | | | | | | | | Merge branch 'jh/submodule-foreach'Junio C Hamano2009-08-275-14/+346
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git clone: Add --recursive to automatically checkout (nested) submodulesJohan Herland2009-08-203-2/+31
| * | | | | | | | | | | | | t7407: Use 'rev-parse --short' rather than bash's substring expansion notationJohan Herland2009-08-201-2/+4
| * | | | | | | | | | | | | git submodule status: Add --recursive to recurse into nested submodulesJohan Herland2009-08-183-6/+51
| * | | | | | | | | | | | | git submodule update: Introduce --recursive to update nested submodulesJohan Herland2009-08-183-3/+36
| * | | | | | | | | | | | | git submodule foreach: Add --recursive to recurse into nested submodulesJohan Herland2009-08-183-4/+124
| * | | | | | | | | | | | | git submodule foreach: test access to submodule name as '$name'Johan Herland2009-08-181-3/+3
View Lorry Controller Status