Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'nd/ls-files-sparse-fix' | Junio C Hamano | 2010-01-22 | 1 | -3/+13 | |
|\ \ \ | ||||||
| * | | | Fix memory corruption when .gitignore does not end by \n | Nguyễn Thái Ngọc Duy | 2010-01-20 | 1 | -3/+13 | |
* | | | | Make difftool.prompt fall back to mergetool.prompt | Sebastian Schuberth | 2010-01-22 | 1 | -1/+2 | |
* | | | | engine.pl: Fix a recent breakage of the buildsystem generator | Ramsay Jones | 2010-01-22 | 1 | -3/+5 | |
* | | | | git-mv: fix moving more than one source to a single destination | Junio C Hamano | 2010-01-22 | 2 | -4/+19 | |
* | | | | rebase -i: Enclose sed command substitution in quotes | Michael Haggerty | 2010-01-22 | 1 | -1/+1 | |
* | | | | rebase -i: Avoid non-portable "test X -a Y" | Michael Haggerty | 2010-01-22 | 1 | -1/+1 | |
* | | | | make "index-pack" a built-in | Linus Torvalds | 2010-01-22 | 7 | -15/+16 | |
* | | | | make "git pack-redundant" a built-in | Linus Torvalds | 2010-01-22 | 4 | -7/+5 | |
* | | | | make "git unpack-file" a built-in | Linus Torvalds | 2010-01-22 | 4 | -5/+4 | |
* | | | | make "mktag" a built-in | Linus Torvalds | 2010-01-22 | 4 | -6/+4 | |
* | | | | make "merge-index" a built-in | Linus Torvalds | 2010-01-22 | 4 | -6/+5 | |
* | | | | merge-tree: remove unnecessary call of git_extract_argv0_path | Johannes Sixt | 2010-01-22 | 1 | -2/+0 | |
* | | | | make "git patch-id" a built-in | Linus Torvalds | 2010-01-21 | 4 | -4/+4 | |
* | | | | make "git var" a built-in | Linus Torvalds | 2010-01-21 | 4 | -4/+4 | |
* | | | | fix git-p4 editor invocation | Nicolas Pitre | 2010-01-21 | 1 | -1/+1 | |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-21 | 2 | -6/+20 | |
|\ \ \ \ | ||||||
| * | | | | merge-recursive: do not return NULL only to cause segfault | Junio C Hamano | 2010-01-21 | 1 | -4/+4 | |
| * | | | | retry request without query when info/refs?query fails | Tay Ray Chuan | 2010-01-21 | 1 | -2/+16 | |
* | | | | | make "git hash-object" a built-in | Linus Torvalds | 2010-01-21 | 4 | -5/+4 | |
* | | | | | make "git merge-tree" a built-in | Linus Torvalds | 2010-01-21 | 4 | -4/+4 | |
* | | | | | slim down "git show-index" | Linus Torvalds | 2010-01-21 | 4 | -67/+69 | |
* | | | | | Remove diff machinery dependency from read-cache | Linus Torvalds | 2010-01-21 | 2 | -78/+76 | |
* | | | | | git-rebase.txt: Fix spelling | Horst H. von Brand | 2010-01-21 | 1 | -1/+1 | |
* | | | | | Make 'rerere forget' work from a subdirectory. | Johannes Sixt | 2010-01-21 | 2 | -24/+53 | |
* | | | | | Make test case numbers unique | Johannes Sixt | 2010-01-21 | 2 | -0/+0 | |
* | | | | | conflict-marker-size: add test and docs | Junio C Hamano | 2010-01-20 | 2 | -0/+29 | |
* | | | | | Update draft release notes to 1.7.0 | Junio C Hamano | 2010-01-20 | 1 | -1/+45 | |
* | | | | | Merge branch 'bw/cvsimport' | Junio C Hamano | 2010-01-20 | 1 | -35/+35 | |
|\ \ \ \ \ | ||||||
| * | | | | | cvsimport: standarize system() calls to external git tools | Ben Walton | 2010-01-19 | 1 | -5/+5 | |
| * | | | | | cvsimport: standarize open() calls to external git tools | Ben Walton | 2010-01-19 | 1 | -4/+4 | |
| * | | | | | cvsimport: modernize callouts to git subcommands | Ben Walton | 2010-01-19 | 1 | -32/+32 | |
* | | | | | | Merge branch 'jc/checkout-merge-base' | Junio C Hamano | 2010-01-20 | 1 | -2/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix "checkout A..." synonym for "checkout A...HEAD" on Windows | Junio C Hamano | 2010-01-19 | 1 | -2/+4 | |
* | | | | | | | Merge branch 'ag/patch-header-verify' | Junio C Hamano | 2010-01-20 | 2 | -1/+39 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | builtin-apply.c: fix the --- and +++ header filename consistency check | Andreas Gruenbacher | 2010-01-18 | 2 | -1/+39 | |
* | | | | | | | | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 | 16 | -78/+155 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | rerere: honor conflict-marker-size attribute | Junio C Hamano | 2010-01-17 | 3 | -2/+20 | |
| * | | | | | | | | rerere: prepare for customizable conflict marker length | Junio C Hamano | 2010-01-17 | 1 | -10/+44 | |
| * | | | | | | | | conflict-marker-size: new attribute | Junio C Hamano | 2010-01-16 | 1 | -25/+34 | |
| * | | | | | | | | rerere: use ll_merge() instead of using xdl_merge() | Junio C Hamano | 2010-01-16 | 1 | -4/+1 | |
| * | | | | | | | | merge-tree: use ll_merge() not xdl_merge() | Junio C Hamano | 2010-01-16 | 2 | -11/+9 | |
| * | | | | | | | | xdl_merge(): allow passing down marker_size in xmparam_t | Junio C Hamano | 2010-01-16 | 2 | -8/+18 | |
| * | | | | | | | | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano | 2010-01-16 | 6 | -12/+17 | |
| * | | | | | | | | git_attr(): fix function signature | Junio C Hamano | 2010-01-16 | 9 | -14/+19 | |
* | | | | | | | | | Merge branch 'ag/maint-apply-too-large-p' | Junio C Hamano | 2010-01-20 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | builtin-apply.c: Skip filenames without enough components | Andreas Gruenbacher | 2010-01-18 | 2 | -2/+14 | |
* | | | | | | | | | | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 | 21 | -54/+392 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Document that merge strategies can now take their own options | Junio C Hamano | 2010-01-17 | 2 | -1/+33 | |
| * | | | | | | | | | | Extend merge-subtree tests to test -Xsubtree=dir. | Avery Pennarun | 2010-01-17 | 1 | -1/+46 |