summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make difftool.prompt fall back to mergetool.promptSebastian Schuberth2010-01-221-1/+2
* engine.pl: Fix a recent breakage of the buildsystem generatorRamsay Jones2010-01-221-3/+5
* git-mv: fix moving more than one source to a single destinationJunio C Hamano2010-01-222-4/+19
* rebase -i: Enclose sed command substitution in quotesMichael Haggerty2010-01-221-1/+1
* rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty2010-01-221-1/+1
* make "index-pack" a built-inLinus Torvalds2010-01-227-15/+16
* make "git pack-redundant" a built-inLinus Torvalds2010-01-224-7/+5
* make "git unpack-file" a built-inLinus Torvalds2010-01-224-5/+4
* make "mktag" a built-inLinus Torvalds2010-01-224-6/+4
* make "merge-index" a built-inLinus Torvalds2010-01-224-6/+5
* merge-tree: remove unnecessary call of git_extract_argv0_pathJohannes Sixt2010-01-221-2/+0
* make "git patch-id" a built-inLinus Torvalds2010-01-214-4/+4
* make "git var" a built-inLinus Torvalds2010-01-214-4/+4
* fix git-p4 editor invocationNicolas Pitre2010-01-211-1/+1
* Merge branch 'maint'Junio C Hamano2010-01-212-6/+20
|\
| * merge-recursive: do not return NULL only to cause segfaultJunio C Hamano2010-01-211-4/+4
| * retry request without query when info/refs?query failsTay Ray Chuan2010-01-211-2/+16
* | make "git hash-object" a built-inLinus Torvalds2010-01-214-5/+4
* | make "git merge-tree" a built-inLinus Torvalds2010-01-214-4/+4
* | slim down "git show-index"Linus Torvalds2010-01-214-67/+69
* | Remove diff machinery dependency from read-cacheLinus Torvalds2010-01-212-78/+76
* | git-rebase.txt: Fix spellingHorst H. von Brand2010-01-211-1/+1
* | Make 'rerere forget' work from a subdirectory.Johannes Sixt2010-01-212-24/+53
* | Make test case numbers uniqueJohannes Sixt2010-01-212-0/+0
* | conflict-marker-size: add test and docsJunio C Hamano2010-01-202-0/+29
* | Update draft release notes to 1.7.0Junio C Hamano2010-01-201-1/+45
* | Merge branch 'bw/cvsimport'Junio C Hamano2010-01-201-35/+35
|\ \
| * | cvsimport: standarize system() calls to external git toolsBen Walton2010-01-191-5/+5
| * | cvsimport: standarize open() calls to external git toolsBen Walton2010-01-191-4/+4
| * | cvsimport: modernize callouts to git subcommandsBen Walton2010-01-191-32/+32
* | | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-201-2/+4
|\ \ \
| * | | Fix "checkout A..." synonym for "checkout A...HEAD" on WindowsJunio C Hamano2010-01-191-2/+4
* | | | Merge branch 'ag/patch-header-verify'Junio C Hamano2010-01-202-1/+39
|\ \ \ \
| * | | | builtin-apply.c: fix the --- and +++ header filename consistency checkAndreas Gruenbacher2010-01-182-1/+39
* | | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-2016-78/+155
|\ \ \ \ \
| * | | | | rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-173-2/+20
| * | | | | rerere: prepare for customizable conflict marker lengthJunio C Hamano2010-01-171-10/+44
| * | | | | conflict-marker-size: new attributeJunio C Hamano2010-01-161-25/+34
| * | | | | rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano2010-01-161-4/+1
| * | | | | merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-162-11/+9
| * | | | | xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-162-8/+18
| * | | | | xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-166-12/+17
| * | | | | git_attr(): fix function signatureJunio C Hamano2010-01-169-14/+19
* | | | | | Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano2010-01-202-2/+14
|\ \ \ \ \ \
| * | | | | | builtin-apply.c: Skip filenames without enough componentsAndreas Gruenbacher2010-01-182-2/+14
* | | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-2021-54/+392
|\ \ \ \ \ \ \
| * | | | | | | Document that merge strategies can now take their own optionsJunio C Hamano2010-01-172-1/+33
| * | | | | | | Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-171-1/+46
| * | | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-176-18/+91
| * | | | | | | pull: Fix parsing of -X<option>Junio C Hamano2010-01-171-7/+14
View Lorry Controller Status