Re: [PATCH] git-pull.sh: better warning message for "git pull" on detached head.
- From
Mike Ralphson <mike.ralphson@gmail.com>
- Date
- Apr 7, 2009, 09:24 UTC
- Message-ID
- <e2b179460904070224o3057c6efk6930bd1249adb0fe@mail.gmail.com>
- In-Reply-To
- <1239052487-6936-1-git-send-email-Matthieu.Moy@imag.fr>
2009/4/6 Matthieu Moy <Matthieu.Moy@imag.fr>:
> Otherwise, git complains about not finding a branch to pull from in > 'branch..merge', which is hardly understandable.
> + echo "You asked me to pull without telling me which branch you want" > + echo "to merge with, and you are on a detached HEAD, so I cannot" > + echo "know from 'branch.<branchname>.merge' in your configuration" > + echo "file. Please name which branch you want to merge on the command"
'Know from' in this sense is a little confusing. Maybe something like:
s/so I cannot know from 'branch.<branchname>.merge' in your configuration file/ \ so I cannot use any 'branch.<branchname>.merge' from your configuration file
?
> + echo "your configuration file does not tell me either. Please" > + echo "name which branch you want to merge on the command line and" > + echo "try again (e.g. 'git pull <repository> <refspec>')."
I know you haven't changed this part, but as it's included in the patch, what we're asking the user to do is to 'specify' the branch to merge, not to 'name' it.
Mike