aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-18
| | * | | diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-18
| | * | | diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey2008-09-18
| | | |/ | | |/|
* | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \ \ \
| * | | | Fix AsciiDoc errors in merge documentationJohan Herland2008-09-04
| * | | | git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-31
| * | | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-31
| * | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-30
| * | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-30
| |\ \ \ \
| | * | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-30
| | * | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-30
| * | | | | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-30
| * | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
| * | | | | rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-30
| * | | | | rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-30
| * | | | | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-30
| * | | | | xmerge.c: minimum readability fixupsJunio C Hamano2008-08-30
| * | | | | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
| * | | | | xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-30
* | | | | | Add contrib/rerere-train scriptNanako Shiraishi2008-09-29
* | | | | | mingw: remove use of _getdrive() from lstat/fstatDmitry Potapov2008-09-29
* | | | | | compat/mingw: Support a timeout in the poll emulation if no fds are givenJohannes Sixt2008-09-29
* | | | | | usage.c: remove unused functionsNanako Shiraishi2008-09-29
* | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-26
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove empty directories in recursive mergeAlex Riesen2008-09-26
| * | | | | Documentation: clarify the details of overriding LESS via core.pagerChris Frey2008-09-26
* | | | | | Cleanup remove_pathAlex Riesen2008-09-26
* | | | | | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \
| * | | | | | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-06
| * | | | | | merge-recursive: get rid of virtual_idMiklos Vajna2008-09-05
| * | | | | | merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-04
| * | | | | | merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-04
| * | | | | | merge-recursive: get rid of the index_only global variableMiklos Vajna2008-09-04
| * | | | | | merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-03
| * | | | | | cherry-pick/revert: make direct internal call to merge_tree()Miklos Vajna2008-09-02
| * | | | | | builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna2008-08-30
| * | | | | | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-30
| * | | | | | merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-30
| * | | | | | Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-30
* | | | | | | Merge branch 'jc/alternate-push'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \
| * | | | | | | push: receiver end advertises refs from alternate repositoriesJunio C Hamano2008-09-09
| * | | | | | | push: prepare sender to receive extended ref information from the receiverJunio C Hamano2008-09-09
| * | | | | | | receive-pack: make it a builtinJunio C Hamano2008-09-09
| * | | | | | | is_directory(): a generic helper functionJunio C Hamano2008-09-09
* | | | | | | | Merge branch 'am/status'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \
| * | | | | | | | wt-status: Teach how to discard changes in the working directoryAnders Melchiorsen2008-09-07
| * | | | | | | | wt-status: Split header generation into three functionsAnders Melchiorsen2008-09-07
* | | | | | | | | Merge branch 'pb/autocorrect-wrapper'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git wrapper: also use aliases to correct mistyped commandsPieter de Bie2008-09-11
* | | | | | | | | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-09 17:19:28 +0000