All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: Drew Northup <drew.northup@maine.edu>,
	git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/2] git-rebase.txt: clarify that --abort checks out <branch>
Date: Tue, 5 Jul 2011 21:52:28 -0500	[thread overview]
Message-ID: <20110706025228.GB10015@elie> (raw)
In-Reply-To: <alpine.DEB.2.00.1107052148370.7799@debian>

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.)  Sorry to
have been slow to respond lately.

  reply	other threads:[~2011-07-06  2:52 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 [this message]
2011-07-06 13:25       ` Drew Northup
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110706025228.GB10015@elie \
    --to=jrnieder@gmail.com \
    --cc=drew.northup@maine.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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. 
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.