| commit | 50909c1f071518fc4d7c15c983f407193b943233 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Apr 2010 07:11:34 +0000 (5 00:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Apr 2010 07:11:34 +0000 (5 00:11 -0700) | ||
| tree | 23e8ba37946e0e8f7412efc62b96cefa53028d58 | treesnapshot (tar.gz zip) |
| parent | c303c1b3242eaacf3f3c56ba3a93a3eba1aeb693 | 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 |