All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: A call for better git-rebase messages
Date: Tue, 19 Dec 2006 11:17:35 +0100	[thread overview]
Message-ID: <em8e32$s7b$1@sea.gmane.org> (raw)

 $ git rebase abort
 mkdir: cannot create directory `.dotest': File exists

 It seems that I cannot create a .dotest directory, and I wonder if you
 are in the middle of patch application or another rebase.  If that is not
 the case, please rm -fr .dotest and run me again.  I am stopping in case
 you still have something valuable there.

Why we do not tell to run "git rebase --abort" here? I think the command
know that it is a middle of git-rebase, not the middle of git-am...


 $ git rebase --onto origin next gitweb/web
 Nothing to do.

I'm not sure, but I think gitweb/web which was empty branch based off
former next is now empty branch based off current gitweb, i.e. at least
head of this branch has changed... but I'm not sure because

 $ git rebase --abort

is _not_ recorded as such, but as "reset --hard ORIG_HEAD" (I think).
It looks like it is, because after "reset --hard ORIG_HEAD" (which was
result of "git rebase --abort" of "git rebase origin" (I forgot
gitweb/web was based off other branch) there is "reset --hard <sha1>",
and this sha1 is sha1 of both gitweb/web and origin.

I'd rather rebase told me that it did something (moved head), but
there are no patches to be applied.
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git


             reply	other threads:[~2006-12-19 10:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-19 10:17 Jakub Narebski [this message]
2006-12-19 10:30 ` A call for better git-rebase messages 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='em8e32$s7b$1@sea.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.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.