From: Eli Barzilay Date: Sun, 06 Jun 2010 13:10:44 GMT Subject: Re: rebase --continue confusion Message-ID: In-Reply-To: <4C01B855.7080409@gmail.com> Dale Rowley 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!