Re: rebase --continue confusion

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Jun  6, Jeff King wrote:
> On Sun, Jun 06, 2010 at 09:10:44AM -0400, Eli Barzilay wrote:
> 
> > 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
> 
> I'm confused. Is there some context for when you are issuing these
> commands?  Because the "git commit --amend foo" should actually
> commit foo, and does for me.

Heh, in that case it was more effective than I thought...  My point in
the previous posts was also about missing information (in that case,
make `git add' tell you when adding it canceled previously added
changes, and also make `git status' tell you if you're in the middle
of a merge or rebase and in a clean state).

In any case, here's the prelude to the above:

  $ mkdir t; cd t; git init
  $ echo foo > foo; git add foo; git commit -m foo
  $ echo bar > foo; git commit -o foo -m bar
  $ echo foo > foo

(And as cooked as it seems, I posted it because I actually ran into it
this morning.)

-- 
          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
                    http://barzilay.org/                   Maze is Life!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]