summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-303-5/+173
| * | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-303-24/+177
| |\ \ \ \
| | * | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-303-3/+72
| | * | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-303-24/+59
| * | | | | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-302-6/+14
| * | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-305-1/+47
| * | | | | rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-301-2/+8
| * | | | | rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-301-10/+13
| * | | | | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-302-3/+10
| * | | | | xmerge.c: minimum readability fixupsJunio C Hamano2008-08-301-7/+7
| * | | | | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-304-21/+135
| * | | | | xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-301-51/+70
* | | | | | Add contrib/rerere-train scriptNanako Shiraishi2008-09-291-0/+52
* | | | | | mingw: remove use of _getdrive() from lstat/fstatDmitry Potapov2008-09-291-3/+2
* | | | | | compat/mingw: Support a timeout in the poll emulation if no fds are givenJohannes Sixt2008-09-291-1/+6
* | | | | | usage.c: remove unused functionsNanako Shiraishi2008-09-292-19/+0
* | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-263-5/+23
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove empty directories in recursive mergeAlex Riesen2008-09-262-3/+12
| * | | | | Documentation: clarify the details of overriding LESS via core.pagerChris Frey2008-09-261-2/+11
* | | | | | Cleanup remove_pathAlex Riesen2008-09-261-5/+3
* | | | | | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-258-1454/+1580
|\ \ \ \ \ \
| * | | | | | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-062-0/+23
| * | | | | | merge-recursive: get rid of virtual_idMiklos Vajna2008-09-051-5/+1
| * | | | | | merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-042-27/+34
| * | | | | | merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-042-19/+19
| * | | | | | merge-recursive: get rid of the index_only global variableMiklos Vajna2008-09-041-73/+67
| * | | | | | merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-032-13/+13
| * | | | | | cherry-pick/revert: make direct internal call to merge_tree()Miklos Vajna2008-09-021-40/+43
| * | | | | | builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna2008-08-301-29/+63
| * | | | | | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-304-169/+192
| * | | | | | merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-303-46/+75
| * | | | | | Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-304-1324/+1341
* | | | | | | Merge branch 'jc/alternate-push'Shawn O. Pearce2008-09-2514-34/+114
|\ \ \ \ \ \ \
| * | | | | | | push: receiver end advertises refs from alternate repositoriesJunio C Hamano2008-09-093-0/+50
| * | | | | | | push: prepare sender to receive extended ref information from the receiverJunio C Hamano2008-09-095-10/+39
| * | | | | | | receive-pack: make it a builtinJunio C Hamano2008-09-094-4/+6
| * | | | | | | is_directory(): a generic helper functionJunio C Hamano2008-09-096-20/+19
* | | | | | | | Merge branch 'am/status'Shawn O. Pearce2008-09-252-15/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | wt-status: Teach how to discard changes in the working directoryAnders Melchiorsen2008-09-072-0/+11
| * | | | | | | | wt-status: Split header generation into three functionsAnders Melchiorsen2008-09-071-15/+19
* | | | | | | | | Merge branch 'pb/autocorrect-wrapper'Shawn O. Pearce2008-09-251-8/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git wrapper: also use aliases to correct mistyped commandsPieter de Bie2008-09-111-8/+24
* | | | | | | | | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-255-57/+79
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7603: add new testcases to ensure builtin-commit uses reduce_heads()Miklos Vajna2008-09-101-0/+53
| * | | | | | | | | | builtin-commit: use commit_tree()Miklos Vajna2008-09-101-51/+16
| * | | | | | | | | | commit_tree(): add a new author parameterMiklos Vajna2008-09-103-6/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/apply-include-exclude'Shawn O. Pearce2008-09-252-16/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-apply:--include=pathspecJunio C Hamano2008-09-062-16/+46
* | | | | | | | | | | Merge branch 'jc/safe-c-l-d'Shawn O. Pearce2008-09-251-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | safe_create_leading_directories(): make it about "leading" directoriesJunio C Hamano2008-09-031-1/+5
View Lorry Controller Status