Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | merge-tree: remove unnecessary call of git_extract_argv0_path | Johannes Sixt | 2010-01-22 | |
* | | | | | | | | | make "git patch-id" a built-in | Linus Torvalds | 2010-01-21 | |
* | | | | | | | | | make "git var" a built-in | Linus Torvalds | 2010-01-21 | |
* | | | | | | | | | fix git-p4 editor invocation | Nicolas Pitre | 2010-01-21 | |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-21 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||
| * | | | | | | | | merge-recursive: do not return NULL only to cause segfault | Junio C Hamano | 2010-01-21 | |
| * | | | | | | | | retry request without query when info/refs?query fails | Tay Ray Chuan | 2010-01-21 | |
* | | | | | | | | | make "git hash-object" a built-in | Linus Torvalds | 2010-01-21 | |
* | | | | | | | | | make "git merge-tree" a built-in | Linus Torvalds | 2010-01-21 | |
* | | | | | | | | | slim down "git show-index" | Linus Torvalds | 2010-01-21 | |
* | | | | | | | | | Remove diff machinery dependency from read-cache | Linus Torvalds | 2010-01-21 | |
* | | | | | | | | | git-rebase.txt: Fix spelling | Horst H. von Brand | 2010-01-21 | |
* | | | | | | | | | Make 'rerere forget' work from a subdirectory. | Johannes Sixt | 2010-01-21 | |
* | | | | | | | | | Make test case numbers unique | Johannes Sixt | 2010-01-21 | |
* | | | | | | | | | conflict-marker-size: add test and docs | Junio C Hamano | 2010-01-20 | |
* | | | | | | | | | Update draft release notes to 1.7.0 | Junio C Hamano | 2010-01-20 | |
* | | | | | | | | | Merge branch 'bw/cvsimport' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | cvsimport: standarize system() calls to external git tools | Ben Walton | 2010-01-19 | |
| * | | | | | | | | | cvsimport: standarize open() calls to external git tools | Ben Walton | 2010-01-19 | |
| * | | | | | | | | | cvsimport: modernize callouts to git subcommands | Ben Walton | 2010-01-19 | |
* | | | | | | | | | | Merge branch 'jc/checkout-merge-base' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | Fix "checkout A..." synonym for "checkout A...HEAD" on Windows | Junio C Hamano | 2010-01-19 | |
* | | | | | | | | | | | Merge branch 'ag/patch-header-verify' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | builtin-apply.c: fix the --- and +++ header filename consistency check | Andreas Gruenbacher | 2010-01-18 | |
* | | | | | | | | | | | | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | rerere: honor conflict-marker-size attribute | Junio C Hamano | 2010-01-17 | |
| * | | | | | | | | | | | | rerere: prepare for customizable conflict marker length | Junio C Hamano | 2010-01-17 | |
| * | | | | | | | | | | | | conflict-marker-size: new attribute | Junio C Hamano | 2010-01-16 | |
| * | | | | | | | | | | | | rerere: use ll_merge() instead of using xdl_merge() | Junio C Hamano | 2010-01-16 | |
| * | | | | | | | | | | | | merge-tree: use ll_merge() not xdl_merge() | Junio C Hamano | 2010-01-16 | |
| * | | | | | | | | | | | | xdl_merge(): allow passing down marker_size in xmparam_t | Junio C Hamano | 2010-01-16 | |
| * | | | | | | | | | | | | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano | 2010-01-16 | |
| * | | | | | | | | | | | | git_attr(): fix function signature | Junio C Hamano | 2010-01-16 | |
* | | | | | | | | | | | | | Merge branch 'ag/maint-apply-too-large-p' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | builtin-apply.c: Skip filenames without enough components | Andreas Gruenbacher | 2010-01-18 | |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | Document that merge strategies can now take their own options | Junio C Hamano | 2010-01-17 | |
| * | | | | | | | | | | | | | Extend merge-subtree tests to test -Xsubtree=dir. | Avery Pennarun | 2010-01-17 | |
| * | | | | | | | | | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 | |
| * | | | | | | | | | | | | | pull: Fix parsing of -X<option> | Junio C Hamano | 2010-01-17 | |
| * | | | | | | | | | | | | | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 2010-01-17 | |
| * | | | | | | | | | | | | | git merge -X<option> | Avery Pennarun | 2010-01-17 | |
| * | | | | | | | | | | | | | git-merge-file --ours, --theirs | Junio C Hamano | 2009-11-29 | |
| * | | | | | | | | | | | | | Merge remote branch 'ko/master' into HEAD | Junio C Hamano | 2009-11-29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/status-partial-refresh' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | rm: only refresh entries that we may touch | Nguyễn Thái Ngọc Duy | 2010-01-19 | |
| * | | | | | | | | | | | | | | | status: only touch path we may need to check | Nguyễn Thái Ngọc Duy | 2010-01-15 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | |
| * | | | | | | | | | | | | | | | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 |