summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Phil Hord <hordp@cisco.com>2012-10-23 16:39:56 -0400
committerLibravatar Jeff King <peff@peff.net>2012-10-25 05:32:11 -0400
commite980765c59c173e9a10ce1069c763645b87fd50c (patch)
tree2307619d5a0395087b2d783b221a06c1edd0955d /git-rebase--merge.sh
parentGit 1.8.0 (diff)
downloadtgif-e980765c59c173e9a10ce1069c763645b87fd50c.tar.xz
git-pull: Avoid merge-base on detached head
git pull --rebase does some clever tricks to find the base for $upstream, but it forgets that we may not have any branch at all. When this happens, git merge-base reports its "usage" help in the middle of an otherwise successful rebase operation, because git-merge is called with one too few parameters. Since we do not need the merge-base trick in the case of a detached HEAD, detect this condition and bypass the clever trick and the usage noise. Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions