| commit | 3387423870e2efbc0b1bf7478a03320e55d2f0bc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Sep 2012 21:36:00 +0000 (18 14:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Sep 2012 21:36:00 +0000 (18 14:36 -0700) | ||
| tree | c5348a045cce07f674fc28e5facf0f5e0d6746da | treesnapshot (tar.gz zip) |
| parent | d71abd99f82e7076775f12deb9326f7d26761591 | commitdiff |
| parent | 5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f | commitdiff |
Merge branch 'mv/cherry-pick-s'
After "git cherry-pick -s" gave control back to the user asking
help to resolve conflicts, concluding "git commit" needs to be run
with "-s" if the user wants to sign it off, but the command should
be able to remember that.
* mv/cherry-pick-s:
cherry-pick: don't forget -s on failure
After "git cherry-pick -s" gave control back to the user asking
help to resolve conflicts, concluding "git commit" needs to be run
with "-s" if the user wants to sign it off, but the command should
be able to remember that.
* mv/cherry-pick-s:
cherry-pick: don't forget -s on failure