From: Drew Northup <drew.northup@maine.edu>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 2/2] git-rebase.txt: clarify that --abort checks out <branch>
Date: Wed, 06 Jul 2011 09:25:07 -0400 [thread overview]
Message-ID: <1309958707.10212.6.camel@drew-northup.unet.maine.edu> (raw)
In-Reply-To: <20110706025228.GB10015@elie>
On Tue, 2011-07-05 at 21:52 -0500, Jonathan Nieder wrote:
> Martin von Zweigbergk wrote:
>
> > That reminds me that <branch> may not have been specified. How about
> > saying things more explicitly like this?
> >
> > Abort the rebase operation and reset HEAD to the original branch. If
> > <branch> was provided when the rebase operation was started, then
> > HEAD will be reset to <branch>. Otherwise HEAD will be reset to
> > where it was when the rebase operation was started.
>
> Sounds great to me for what it's worth. (With the caveat that "git
> rebase --abort" reattaches HEAD in addition to what "git reset --hard"
> would do, but I think it's fine to just leave that implied.)
Agreed, that is better.
--
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
next prev parent reply other threads:[~2011-07-06 13:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-02 2:38 [PATCH 2/2] git-rebase.txt: clarify that --abort checks out <branch> Martin von Zweigbergk
2011-07-05 21:43 ` Drew Northup
2011-07-06 2:19 ` Martin von Zweigbergk
2011-07-06 2:52 ` Jonathan Nieder
2011-07-06 13:25 ` Drew Northup [this message]
2011-07-08 2:27 ` [PATCH v2] " Martin von Zweigbergk
2011-07-08 16:07 ` Junio C Hamano
2011-07-10 18:07 ` Martin von Zweigbergk
2011-07-10 18:31 ` [PATCH v3] " Martin von Zweigbergk
2011-07-14 3:47 ` [PATCH v4] rebase: clarify "restore the original branch" Martin von Zweigbergk
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309958707.10212.6.camel@drew-northup.unet.maine.edu \
--to=drew.northup@maine.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=martin.von.zweigbergk@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).