All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: "Conrad Irwin" <conrad.irwin@gmail.com>,
	"☂Josh Chia (谢任中)" <joshchia@gmail.com>,
	git@vger.kernel.org, "Soeren Sonnenburg" <sonne@debian.org>
Subject: Re: git branch -M" regression in 1.7.7?
Date: Sat, 26 Nov 2011 14:38:16 -0800	[thread overview]
Message-ID: <7v39day0fb.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20111126085455.GB22656@elie.hsd1.il.comcast.net> (Jonathan Nieder's message of "Sat, 26 Nov 2011 02:54:55 -0600")

Jonathan Nieder <jrnieder@gmail.com> writes:

> In other words, when on master, "git checkout -B master <commit>"
> would be another way to say "git reset --keep <commit>", except that
> it also sets up tracking.

I havn't look at the patch (not a regression between 1.7.7 and 1.7.8 so
not a candidate for the remainder of this cycle), but I like the above
description quite a lot. I think Linus's "git reset --sane" which was
initially called "git reset --merge" but ended up as "git reset --keep"
should have been spelled as "checkout -B <current-branch>" from the
beginning.

  reply	other threads:[~2011-11-26 22:38 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-26  0:36 git branch -M" regression in 1.7.7? ☂Josh Chia (谢任中)
2011-11-26  2:30 ` Jonathan Nieder
2011-11-26  6:52   ` [PATCH] Test renaming a branch to itself Conrad Irwin
2011-11-26  6:59     ` Jonathan Nieder
2011-11-26  7:05   ` git branch -M" regression in 1.7.7? Conrad Irwin
2011-11-26  8:54     ` Jonathan Nieder
2011-11-26 22:38       ` Junio C Hamano [this message]
2011-11-26 23:09         ` Andreas Schwab
2011-11-28 19:38   ` Junio C Hamano

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=7v39day0fb.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=conrad.irwin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=joshchia@gmail.com \
    --cc=jrnieder@gmail.com \
    --cc=sonne@debian.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.