summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-11-18 19:33:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-18 19:33:45 -0800
commit611addf8900efc19a859f3f0afc680fe53831527 (patch)
treeaae4dc0ea965dde90a10dbebf284dc5116391232 /git-rebase--merge.sh
parentMerge branch 'mm/maint-doc-remote-tracking' into maint (diff)
parentgit-pull: Avoid merge-base on detached head (diff)
downloadtgif-611addf8900efc19a859f3f0afc680fe53831527.tar.xz
Merge branch 'ph/pull-rebase-detached' into maint
"git pull --rebase" run while the HEAD is detached tried to find the upstream branch of the detached HEAD (which by definition does not exist) and emitted unnecessary error messages. * ph/pull-rebase-detached: git-pull: Avoid merge-base on detached head
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions