aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | fix git-p4 editor invocationNicolas Pitre2010-01-21
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-21
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | merge-recursive: do not return NULL only to cause segfaultJunio C Hamano2010-01-21
| * | | | | | | | | | retry request without query when info/refs?query failsTay Ray Chuan2010-01-21
* | | | | | | | | | | make "git hash-object" a built-inLinus Torvalds2010-01-21
* | | | | | | | | | | make "git merge-tree" a built-inLinus Torvalds2010-01-21
* | | | | | | | | | | slim down "git show-index"Linus Torvalds2010-01-21
* | | | | | | | | | | Remove diff machinery dependency from read-cacheLinus Torvalds2010-01-21
* | | | | | | | | | | git-rebase.txt: Fix spellingHorst H. von Brand2010-01-21
* | | | | | | | | | | Make 'rerere forget' work from a subdirectory.Johannes Sixt2010-01-21
* | | | | | | | | | | Make test case numbers uniqueJohannes Sixt2010-01-21
* | | | | | | | | | | conflict-marker-size: add test and docsJunio C Hamano2010-01-20
* | | | | | | | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-20
* | | | | | | | | | | Merge branch 'bw/cvsimport'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cvsimport: standarize system() calls to external git toolsBen Walton2010-01-19
| * | | | | | | | | | | cvsimport: standarize open() calls to external git toolsBen Walton2010-01-19
| * | | | | | | | | | | cvsimport: modernize callouts to git subcommandsBen Walton2010-01-19
* | | | | | | | | | | | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix "checkout A..." synonym for "checkout A...HEAD" on WindowsJunio C Hamano2010-01-19
* | | | | | | | | | | | | Merge branch 'ag/patch-header-verify'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | builtin-apply.c: fix the --- and +++ header filename consistency checkAndreas Gruenbacher2010-01-18
* | | | | | | | | | | | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-17
| * | | | | | | | | | | | | | rerere: prepare for customizable conflict marker lengthJunio C Hamano2010-01-17
| * | | | | | | | | | | | | | conflict-marker-size: new attributeJunio C Hamano2010-01-16
| * | | | | | | | | | | | | | rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano2010-01-16
| * | | | | | | | | | | | | | merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-16
| * | | | | | | | | | | | | | xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-16
| * | | | | | | | | | | | | | xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
| * | | | | | | | | | | | | | git_attr(): fix function signatureJunio C Hamano2010-01-16
* | | | | | | | | | | | | | | Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | builtin-apply.c: Skip filenames without enough componentsAndreas Gruenbacher2010-01-18
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Document that merge strategies can now take their own optionsJunio C Hamano2010-01-17
| * | | | | | | | | | | | | | | Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-17
| * | | | | | | | | | | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-17
| * | | | | | | | | | | | | | | pull: Fix parsing of -X<option>Junio C Hamano2010-01-17
| * | | | | | | | | | | | | | | Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-17
| * | | | | | | | | | | | | | | git merge -X<option>Avery Pennarun2010-01-17
| * | | | | | | | | | | | | | | git-merge-file --ours, --theirsJunio C Hamano2009-11-29
| * | | | | | | | | | | | | | | Merge remote branch 'ko/master' into HEADJunio C Hamano2009-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/status-partial-refresh'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rm: only refresh entries that we may touchNguyễn Thái Ngọc Duy2010-01-19
| * | | | | | | | | | | | | | | | | status: only touch path we may need to checkNguyễn Thái Ngọc Duy2010-01-15
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10
| * | | | | | | | | | | | | | | | Documentation: format full commands in typewriter fontThomas Rast2010-01-10
| * | | | | | | | | | | | | | | | Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-09
| * | | | | | | | | | | | | | | | Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-09
* | | | | | | | | | | | | | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-19 05:46:48 +0000