diff options
| author |  Martin von Zweigbergk <martinvonz@gmail.com> | 2012-12-21 11:10:11 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-12-23 10:40:37 -0800 |
| commit | 334ae397452170dacfcd8e69e4a41f6a64f54eec (patch) | |
| tree | 10195585b9d28180cd58df7e43e975016359cdf6 /Documentation/diff-config.txt | |
| parent | tests: move test_cmp_rev to test-lib-functions (diff) | |
| download | tgif-334ae397452170dacfcd8e69e4a41f6a64f54eec.tar.xz | |
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>
Diffstat (limited to 'Documentation/diff-config.txt')
0 files changed, 0 insertions, 0 deletions