From: Martin Langhoff <martin.langhoff@gmail.com>
To: Ben Greear <greearb@candelatech.com>
Cc: git@vger.kernel.org
Subject: Re: question git & branches
Date: Mon, 29 Aug 2005 23:27:12 +1200 [thread overview]
Message-ID: <46a038f90508290427236e261b@mail.gmail.com> (raw)
In-Reply-To: <4312C24E.4000803@candelatech.com>
On 8/29/05, Ben Greear <greearb@candelatech.com> wrote:
> I created a new branch 'ben_dev_rfcnt'.
>
> Now, I also have another patch that I wanted to pull into git.
>
> Before merging this, I created another branch 'foo'.
>
> I changed to this branch foo and imported my patch and resolved the
> conflicts, etc.
Are you using git-checkout to change branches? If you have cogito
installed, cg-status is a good, handy way of confirming you are where
you expect to be.
You can also do git-show-branch{,es-script}
cheers,
martin
next prev parent reply other threads:[~2005-08-29 11:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-29 8:07 question git & branches Ben Greear
2005-08-29 11:27 ` Martin Langhoff [this message]
2005-08-29 12:15 ` Alex Riesen
2005-08-29 15:03 ` Linus Torvalds
2005-08-29 17:49 ` Ben Greear
2005-08-29 18:04 ` Linus Torvalds
2005-08-29 20:20 ` Jon Loeliger
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=46a038f90508290427236e261b@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=git@vger.kernel.org \
--cc=greearb@candelatech.com \
/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).