summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-234-0/+79
* commit: -F overrides -tStephen Boyd2009-05-232-0/+14
* Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-131-1/+3
|\
| * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-131-1/+3
| |\
| | * ls-tree manpage: output of ls-tree is compatible with update-indexAlex Riesen2009-05-101-0/+2
| | * ls-tree manpage: use "unless" instead of "when ... is not"Alex Riesen2009-05-101-1/+1
* | | Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2Junio C Hamano2009-05-122-8/+29
|\ \ \
| * | | Revert "checkout branch: prime cache-tree fully"Junio C Hamano2009-05-122-8/+29
* | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-080-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-081-2/+2
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maintJunio C Hamano2009-05-051-1/+1
|\ \ \ \
| * | | | git-svn: fix a sloppy Getopt::Long usageRobin H. Johnson2009-05-051-1/+1
* | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-05-051-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | dir.c: Fix two minor grammatical errors in commentsAllan Caffee2009-05-051-2/+2
| |/ / /
* | | | improve error message in config.cAlex Riesen2009-05-051-1/+1
* | | | t4018-diff-funcname: add cpp xfuncname pattern to syntax testBrandon Casey2009-05-051-1/+1
* | | | Work around BSD whose typeof(tv.tv_sec) != time_tBernd Ahlers2009-05-051-1/+3
* | | | git-am.txt: reword extra headers in message bodyStephen Boyd2009-05-051-4/+4
* | | | git-am.txt: Use date or value instead of time or timestampStephen Boyd2009-05-051-4/+4
* | | | git-am.txt: add an 'a', say what 'it' is, simplify a sentenceStephen Boyd2009-05-051-6/+6
* | | | GIT 1.6.2.5v1.6.2.5Junio C Hamano2009-05-033-2/+23
* | | | Merge branch 'np/maint-no-ofs-delta' into maintJunio C Hamano2009-05-031-1/+12
|\ \ \ \
| * | | | honor repack.usedeltabaseoffset when fetching packsNicolas Pitre2009-05-011-1/+12
* | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-05-031-0/+25
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | GIT 1.6.1.4v1.6.1.4Junio C Hamano2009-05-032-1/+26
| * | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-0311-74/+105
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-032-1/+17
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano2009-05-034-5/+29
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jc/maint-read-tree-multi' into maintJunio C Hamano2009-05-034-41/+55
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | checkout branch: prime cache-tree fullyJunio C Hamano2009-04-201-1/+8
| * | | | | | | read-tree -m A B: prime cache-tree from the switched-to treeJunio C Hamano2009-04-201-0/+5
| * | | | | | | Move prime_cache_tree() to cache-tree.cJunio C Hamano2009-04-204-36/+40
| * | | | | | | read-tree A B: do not corrupt cache-treeJunio C Hamano2009-04-201-4/+2
* | | | | | | | Merge branch 'mk/maint-apply-swap' into maintJunio C Hamano2009-05-032-7/+112
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: make test-apply-criss-cross-rename more robustMichał Kiedrowicz2009-04-201-3/+31
| * | | | | | | | builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-202-8/+47
| * | | | | | | | tests: test applying criss-cross rename patchMichał Kiedrowicz2009-04-201-0/+38
| |/ / / / / / /
* | | | | | | | Merge branch 'mm/maint-add-p-quit' into maintJunio C Hamano2009-05-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git add -p: add missing "q" to patch promptWincent Colaiuta2009-04-201-1/+1
* | | | | | | | | Merge branch 'lt/pack-object-memuse' into maintJunio C Hamano2009-05-037-43/+56
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | show_object(): push path_name() call further downLinus Torvalds2009-04-127-14/+20
| * | | | | | | | process_{tree,blob}: show objects without bufferingLinus Torvalds2009-04-127-41/+48
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-292-12/+65
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-292-12/+65
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | diff -c -p: do not die on submodulesJunio C Hamano2009-04-292-12/+65
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-284-4/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-284-4/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | grep: fix segfault when "git grep '('" is givenLinus Torvalds2009-04-272-2/+10
| | * | | | | | | Documentation: fix a grammatical error in api-builtin.txtAllan Caffee2009-04-271-1/+1
| | * | | | | | | builtin-merge: fix a typo in an error messageAllan Caffee2009-04-271-1/+1