From: Eli Barzilay <eli@barzilay.org>
To: git@vger.kernel.org
Subject: Re: rebase --continue confusion
Date: Sun, 06 Jun 2010 09:10:44 -0400 [thread overview]
Message-ID: <m3bpbo1f3f.fsf@winooski.ccs.neu.edu> (raw)
In-Reply-To: 4C01B855.7080409@gmail.com
Dale Rowley <ddrowley@gmail.com> writes:
>
> OK, so there isn't a bug in git, but since then I've seen co-workers
> stumped by this same problem. So maybe it would help to clarify the
> message? Maybe something like "The index is in the same state as it
> was before the patch was applied - refusing to make an empty
> commit. Did you forget to use 'git add'? Or maybe you should use
> 'git rebase --skip'?"
There are a number of these things that I asked about recently.
Here's another similarly one:
$ git add foo
$ git status -s
M foo
$ git commit --amend foo
# On branch master
# No changes
$ git status -s
M foo
--
((lambda (x) (x x)) (lambda (x) (x x))) Eli Barzilay:
http://barzilay.org/ Maze is Life!
next prev parent reply other threads:[~2010-06-06 13:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-30 0:59 rebase --continue confusion Dale Rowley
2010-05-30 12:44 ` Tim Visher
2010-05-31 0:14 ` skillzero
[not found] ` <20100530101926.3bac34c8jk@jk.gs@perceptron>
2010-05-31 19:31 ` [PATCH] git-am: suggest what to do with superfluous patches Junio C Hamano
2010-05-31 20:17 ` Ramkumar Ramachandra
2010-05-31 22:51 ` Jan Krüger
2010-06-06 13:10 ` Eli Barzilay [this message]
2010-06-06 22:18 ` rebase --continue confusion Jeff King
2010-06-06 22:32 ` Eli Barzilay
2010-06-06 22:46 ` Jeff King
2010-06-06 23:42 ` Eli Barzilay
2010-06-07 0:41 ` Jeff King
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=m3bpbo1f3f.fsf@winooski.ccs.neu.edu \
--to=eli@barzilay.org \
--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 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).