From: walt <wa1ter@myrealbox.com>
To: git@vger.kernel.org
Subject: New behavior for git-branch?
Date: Sat, 02 Feb 2008 08:57:52 -0800 [thread overview]
Message-ID: <fo27d0$gs7$1@ger.gmane.org> (raw)
Hi,
I've been tracking Junio's git repository for a year or two
and I've used git-bisect many times, but yesterday I got very
disoriented while using git-bisect and git-branch together.
I think I was confused by the output of 'git-branch -v'.
As an example of the new behavior of git-branch, here is what
I see this morning after pulling from Linus:
$git-branch -v
* 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
(I discovered the -a flag just this morning.)
$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.
The old behavior of 'git-branch' always listed 'origin' as well
as 'master', but (I think?) that 'origin' is no longer displayed
using just -v. Is this correct? If so, what would be the right
way to un-bollocks my local repository?
next reply other threads:[~2008-02-02 16:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-02 16:57 walt [this message]
2008-02-03 14:42 ` New behavior for git-branch? walt
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='fo27d0$gs7$1@ger.gmane.org' \
--to=wa1ter@myrealbox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).