From: "David Symonds" <dsymonds@gmail.com>
To: "Bill Lear" <rael@zopyra.com>
Cc: "Jay Soffian" <jaysoffian@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: A couple branch questions
Date: Wed, 13 Feb 2008 19:03:12 -0800 [thread overview]
Message-ID: <ee77f5c20802131903i45b1629fpcb4a5c6e4f483052@mail.gmail.com> (raw)
In-Reply-To: <18355.42595.377377.433309@lisa.zopyra.com>
On Feb 13, 2008 6:24 PM, Bill Lear <rael@zopyra.com> wrote:
>
> On Wednesday, February 13, 2008 at 17:45:16 (-0800) David Symonds writes:
> >On Feb 13, 2008 5:39 PM, Jay Soffian <jaysoffian@gmail.com> wrote:
> >> 1) git-branch -d <branchname> complains if <branchname> hasn't been
> >> merged to HEAD. Shouldn't it really only complain if <branchname>
> >> hasn't been merged into any local branch? i.e., as long as
> >> <branchname> has been merged, why care to which branch?
> >
> >It's easy to mistype branch names, and you typically only delete them
> >after you merge them into your current branch. If you're really sure,
> >just pass -D instead of -d.
>
> How does that answer the question posed?
If I have four branches, a, b1, b2 and c, and I've merged b2 into c
(but planning to keep developing on b2), and just merged b1 into a
(which I have checked out), then I probably only want to delete b1,
not b2. The "current" branch is a useful notion because it
significantly simplifies merging/rebasing operations.
Dave.
next prev parent reply other threads:[~2008-02-14 3:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-14 1:39 A couple branch questions Jay Soffian
2008-02-14 1:45 ` David Symonds
2008-02-14 2:24 ` Bill Lear
2008-02-14 3:03 ` David Symonds [this message]
2008-02-14 3:43 ` Junio C Hamano
2008-02-14 14:01 ` Keeping reflogs on branch deletion Brian Downing
2008-02-14 15:00 ` Nicolas Pitre
2008-02-14 15:08 ` Johannes Schindelin
2008-02-14 15:17 ` Jeff King
2008-02-14 16:16 ` Nicolas Pitre
2008-02-14 16:31 ` Jeff King
2008-02-14 17:32 ` Nicolas Pitre
2008-02-14 17:57 ` Jeff King
2008-02-14 20:17 ` Wincent Colaiuta
2008-02-14 16:35 ` Jakub Narebski
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=ee77f5c20802131903i45b1629fpcb4a5c6e4f483052@mail.gmail.com \
--to=dsymonds@gmail.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=rael@zopyra.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).