Hi, I'm a git newbie, and I stumbled around a bit before I found this git configuration gem: git config branch.master.remote origin git config branch.master.merge refs/heads/master
Could these please be added to the git section of the policy: http://debian-med.alioth.debian.org/docs/policy.html#id304486 This isn't exactly policy though. Perhaps we need to separate the policy document into policy and "Stuff for New Maintainers". Cheers, Shaun $ git pull You asked me to pull without telling me which branch you want to merge with, and 'branch.master.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. If you often merge with the same branch, you may want to use something like the following in your configuration file: [branch "master"] remote = <nickname> merge = <remote-ref> [remote "<nickname>"] url = <url> fetch = <refspec> -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
