Janek Warchoł <[email protected]> writes: > 2012/1/3 Janek Warchoł <[email protected]>: >> 2012/1/3 David Kastrup <[email protected]>: >>> You don't have staging in your fetch line. That's why I recommended >>> fetching * instead of just master. >> >> Ah!! You see, i wasn't smart enough to understand what you wrote >> about that asterisk. >> Everything works fine now, and i understand. Great! Many thanks!! > > Fetching all branches created a new problem: can i tell git that it > should rebase branches against master by default? Because now when i > checked a non-master, non-staging local branch and called 'git pull > -r' he said > > You asked me to pull without telling me which branch you > want to rebase against, and 'branch.mook.merge' in > your configuration file does not tell me, either. Please > specify which branch you want to use on the command line and > try again (e.g. 'git pull <repository> <refspec>'). > See git-pull(1) for details.
I usually rebase manually and instead do just "git fetch". > Of course i can do what he suggests, but it means either > - a lot of typing 'git pull -r origin refs/heads/master' (if i got it right) > - editing config file every time i create a branch (not nice). You can just create the branch as git checkout -b new-branch origin and git will know where to pull from. And you can always do git branch --set-upstream new-branch origin after having created it. -- David Kastrup _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
