diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:33:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:33:45 -0800 |
| commit | 611addf8900efc19a859f3f0afc680fe53831527 (patch) | |
| tree | aae4dc0ea965dde90a10dbebf284dc5116391232 /rerere.h | |
| parent | 78ba7e267caaa696746243888db363f83a061b61 (diff) | |
| parent | e980765c59c173e9a10ce1069c763645b87fd50c (diff) | |
| download | git-611addf8900efc19a859f3f0afc680fe53831527.tar.gz git-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 'rerere.h')
0 files changed, 0 insertions, 0 deletions