Re: [PATCHv2] git-pull: Avoid merge-base on detached head

2012-10-26 Thread Jeff King
On Thu, Oct 25, 2012 at 02:50:37PM -0400, Phil Hord wrote: > >> 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

Re: [PATCHv2] git-pull: Avoid merge-base on detached head

2012-10-25 Thread Phil Hord
Jeff King wrote: > On Tue, Oct 23, 2012 at 04:39:56PM -0400, Phil Hord wrote: > >> 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

Re: [PATCHv2] git-pull: Avoid merge-base on detached head

2012-10-25 Thread Jeff King
On Tue, Oct 23, 2012 at 04:39:56PM -0400, Phil Hord wrote: > 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