| commit | 334ae397452170dacfcd8e69e4a41f6a64f54eec | |
| author | Martin von Zweigbergk <martinvonz@gmail.com> | |
| Fri, 21 Dec 2012 19:10:11 +0000 (21 11:10 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 23 Dec 2012 18:40:37 +0000 (23 10:40 -0800) | ||
| tree | 10195585b9d28180cd58df7e43e975016359cdf6 | treesnapshot (tar.gz zip) |
| parent | 5d77298d084f01a854c8aecc1709acf53d956ef8 | commitdiff |
learn to pick/revert into unborn branch
cherry-picking into an unborn branch should work, so make it work,
with or without --ff.
Cherry-picking anything other than a commit that only adds files, will
naturally result in conflicts. Similarly, revert also works, but will
result in conflicts unless the specified revision only deletes files.
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
cherry-picking into an unborn branch should work, so make it work,
with or without --ff.
Cherry-picking anything other than a commit that only adds files, will
naturally result in conflicts. Similarly, revert also works, but will
result in conflicts unless the specified revision only deletes files.
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory | |
| t/t3501-revert-cherry-pick.sh | diffblobblamehistory | |
| t/t3506-cherry-pick-ff.sh | diffblobblamehistory |