| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | * | | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 | 6 | -18/+91 |
| | * | | | | | | pull: Fix parsing of -X<option> | Junio C Hamano | 2010-01-17 | 1 | -7/+14 |
| | * | | | | | | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 2010-01-17 | 2 | -2/+23 |
| | * | | | | | | git merge -X<option> | Avery Pennarun | 2010-01-17 | 11 | -26/+162 |
| | * | | | | | | git-merge-file --ours, --theirs | Junio C Hamano | 2009-11-29 | 4 | -10/+34 |
| | * | | | | | | Merge remote branch 'ko/master' into HEAD | Junio C Hamano | 2009-11-29 | 320 | -2456/+15901 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge branch 'nd/status-partial-refresh' | Junio C Hamano | 2010-01-20 | 3 | -3/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | rm: only refresh entries that we may touch | Nguyễn Thái Ngọc Duy | 2010-01-19 | 1 | -1/+2 |
| | * | | | | | | | | status: only touch path we may need to check | Nguyễn Thái Ngọc Duy | 2010-01-15 | 2 | -2/+2 |
| * | | | | | | | | | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 | 116 | -685/+693 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | 112 | -647/+647 |
| | * | | | | | | | | | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 | 12 | -28/+28 |
| | * | | | | | | | | | Documentation: warn prominently against merging with dirty trees | Thomas Rast | 2010-01-09 | 2 | -0/+8 |
| | * | | | | | | | | | Documentation/git-merge: reword references to "remote" and "pull" | Thomas Rast | 2010-01-09 | 1 | -17/+17 |
| * | | | | | | | | | | Merge branch 'jh/notes' (early part) | Junio C Hamano | 2010-01-20 | 4 | -18/+895 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Add more testcases to test fast-import of notes | Johan Herland | 2009-12-07 | 1 | -0/+623 |
| | * | | | | | | | | | | Rename t9301 to t9350, to make room for more fast-import tests | Johan Herland | 2009-12-07 | 1 | -0/+0 |
| | * | | | | | | | | | | fast-import: Proper notes tree manipulation | Johan Herland | 2009-12-07 | 2 | -18/+272 |
| * | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |