From: Martin von Zweigbergk Date: Sun, 6 Feb 2011 18:44:00 +0000 (-0500) Subject: rebase -i: remove unnecessary state rebase-root X-Git-Tag: v1.7.6-rc0~136^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c71f8f3d501b155c3efa6aea2bc7768f7ace8cd1?ds=inline;hp=c71f8f3d501b155c3efa6aea2bc7768f7ace8cd1 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 Signed-off-by: Junio C Hamano ---