projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d77298) | patch
learn to pick/revert into unborn branch
authorMartin von Zweigbergk <martinvonz@gmail.com>
Fri, 21 Dec 2012 19:10:11 +0000 (11:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Dec 2012 18:40:37 +0000 (10:40 -0800)
commit334ae397452170dacfcd8e69e4a41f6a64f54eec
tree10195585b9d28180cd58df7e43e975016359cdf6tree | snapshot
parent5d77298d084f01a854c8aecc1709acf53d956ef8commit | diff
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>
sequencer.c diff | blob | history
t/t3501-revert-cherry-pick.sh diff | blob | history
t/t3506-cherry-pick-ff.sh diff | blob | history
Git—the stupid content tracker