Re: New behavior for git-branch?
- From
- walt <wa1ter@myrealbox.com>
- Date
- Feb 3, 2008, 14:42 UTC
- Message-ID
- <fo4jr4$7c0$1@ger.gmane.org>
- In-Reply-To
- <fo27d0$gs7$1@ger.gmane.org>
walt wrote:
Show 9 quoted lines
> ... > $git-branch -av > * master ae9458d Merge git://git.infradead.org/battery-2.6 > origin 8af03e7 Merge branch 'for-2.6.25' of > git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc > origin/master aa62999 x86: fix bootup crash in native_read_tsc() > > In my confusion yesterday, I think I created a new 'origin' which > has nothing to do with Linus' repository -- but I'm not sure...
I fixed it by copying these new settings from Junio's config:
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* branch.master.remote=origin branch.master.merge=refs/heads/master