public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Andy Parkins <andyparkins@gmail•com>
To: git@vger•kernel.org
Cc: Nicolas Pitre <nico@cam•org>
Subject: Re: confusion over the new branch and merge config
Date: Fri, 22 Dec 2006 08:41:44 +0000	[thread overview]
Message-ID: <200612220841.46016.andyparkins@gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0612211555210.18171@xanadu.home>

On Thursday 2006 December 21 22:17, Nicolas Pitre wrote:

Sorry Alan; I thought it was your bug - it wasn't...

> $ git branch -r
> * master
>   origin/HEAD
>   origin/html
>   origin/maint
>   origin/man
>   origin/master
>   origin/next
>   origin/pu
>   origin/todo

I'm trying to track down why "master" is being shown in this case"; would it 
be possible to show me the output of

$ tree .git/refs/heads .git/refs/remotes

As I am having trouble reproducing this error.


Andy

-- 
Dr Andy Parkins, M Eng (hons), MIEE
andyparkins@gmail•com

  parent reply	other threads:[~2006-12-22  8:41 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-21 22:17 confusion over the new branch and merge config Nicolas Pitre
2006-12-21 23:01 ` Junio C Hamano
2006-12-21 23:21   ` Sean
2006-12-22  0:39     ` Junio C Hamano
2006-12-22  0:46     ` Junio C Hamano
2006-12-22  1:01       ` Sean
2006-12-22  8:31       ` Andy Parkins
2006-12-22  7:50   ` Alan Chandler
2006-12-22  8:21     ` Junio C Hamano
2006-12-22  8:39       ` Andy Parkins
2006-12-22 15:25         ` Alan Chandler
2006-12-22 20:49   ` Nicolas Pitre
2006-12-22 21:04     ` Jakub Narebski
2006-12-22 21:20       ` Nicolas Pitre
2006-12-22 22:40         ` Jakub Narebski
2006-12-22 23:39     ` Junio C Hamano
2006-12-23  3:10       ` Tom Prince
2006-12-23  5:11       ` Nicolas Pitre
2006-12-23  5:12   ` Jeff King
2006-12-23  5:29     ` Nicolas Pitre
2006-12-23  6:15     ` Junio C Hamano
2006-12-23  6:22       ` Shawn Pearce
2006-12-23  6:28       ` Jeff King
2006-12-23  7:11         ` Junio C Hamano
2006-12-23  7:25           ` Jeff King
2006-12-23  9:51       ` Junio C Hamano
2006-12-23 10:40         ` Jakub Narebski
2006-12-23 15:58         ` Johannes Schindelin
2006-12-23 22:48           ` Jakub Narebski
2006-12-24  6:15         ` Jeff King
2006-12-24 20:49         ` Nicolas Pitre
2006-12-26  7:33           ` Jeff King
2007-01-02 14:49         ` Jeff King
2007-01-02 17:32           ` Junio C Hamano
2007-01-02 17:34             ` Jeff King
2007-01-02 20:04               ` Junio C Hamano
2007-01-02 20:30                 ` Jakub Narebski
2007-01-03  0:24                   ` Santi Béjar
2007-01-03 23:02                     ` Jakub Narebski
2007-01-09 15:05                 ` Jeff King
2007-01-09 16:18                   ` Jeff King
2006-12-23  8:31     ` Jakub Narebski
2006-12-22  8:41 ` Andy Parkins [this message]
2006-12-22  9:39   ` Lars Hjemli
2006-12-22 15:10     ` Nicolas Pitre

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200612220841.46016.andyparkins@gmail.com \
    --to=andyparkins@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=nico@cam$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox