summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:44:00 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-10 14:08:10 -0800
commitc71f8f3d501b155c3efa6aea2bc7768f7ace8cd1 (patch)
treea98b6256972b0d744769ba26b3018e2008587d70 /git-pull.sh
parentc6f7de5455269ac1fcd268cd3bf592a0f74c1ef8 (diff)
downloadgit-c71f8f3d501b155c3efa6aea2bc7768f7ace8cd1.tar.gz
rebase -i: remove unnecessary state rebase-root
Before calling 'git cherry-pick', interactive rebase currently checks if we are rebasing from root (if --root was passed). If we are, the '--ff' flag to 'git cherry-pick' is omitted. However, according to the documentation for 'git cherry-pick --ff', "If the current HEAD is the same as the parent of the cherry-picked commit, then a fast forward to this commit will be performed.". This should never be the case when rebasing from root, so it should not matter whether --ff is passed, so simplify the code by removing the condition. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions