![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 May 2010 05:34:47 +0000 (22:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 May 2010 05:34:47 +0000 (22:34 -0700) | ||
| commit | f78eeeaf55a4f60a05d3e6452f29a2214c29b6fd | |
| tree | 24d7d6f25b0bdf61cc6bd50a81b1e5500bb89265 | tree | snapshot |
| parent | f350e1faaa7070030a5c40acdaec650b47dfdc12 | commit | diff |
| parent | 91e525989665d69ace11b8f39618b1e8004fe19a | commit | diff |
Merge branch 'cc/revert-strategy'
* 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 | | blob | history |
| builtin/revert.c | diff1 | | diff2 | | blob | history |