| commit | 6d44a83e9e2fb4607917753fa74365c07c8ecf09 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:09 +0000 (4 17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:09 +0000 (4 17:50 -0700) | ||
| tree | 2430a1d1503b3ea25b0bc4417f63dfa4980ac73d | treesnapshot (tar.gz zip) |
| parent | e4b72a0c48e4c9f95a0c060665f093516e592dc5 | commitdiff |
| parent | 91e525989665d69ace11b8f39618b1e8004fe19a | commitdiff |
Merge branch 'cc/revert-strategy' into next
* cc/revert-strategy:
revert: add "--strategy" option to choose merge strategy
merge: make function try_merge_command non static
merge: refactor code that calls "git merge-STRATEGY"
revert: refactor merge recursive code into its own function
revert: use strbuf to refactor the code that writes the merge message
Conflicts:
builtin/revert.c
* cc/revert-strategy:
revert: add "--strategy" option to choose merge strategy
merge: make function try_merge_command non static
merge: refactor code that calls "git merge-STRATEGY"
revert: refactor merge recursive code into its own function
revert: use strbuf to refactor the code that writes the merge message
Conflicts:
builtin/revert.c
| builtin/merge.c | diff1 | diff2 | blobhistory |
| builtin/revert.c | diff1 | diff2 | blobhistory |