On Sun, 2 Dec 2018, SZEDER Gábor wrote:
> On Sun, Dec 02, 2018 at 11:30:19AM -0500, Robert P. J. Day wrote:
> >
> > testing adding by patch for the very first time (i've just never
> > needed this), and reading the "progit" book and reading the man page,
> > and the impression i'm getting is that running "git add -p" (going
> > straight to patch mode) is supposed to be equivalent to running "git
> > add -i", then typing "p" to switch to patch mode.
> >
> > that is most emphatically not what i'm seeing. if i run "git add
> > -p", then i get to what i expect -- the patch subsystem:
> >
> > $ git add -p
> > diff --git a/README.asc b/README.asc
> > index fa40bad..840e85b 100644
> > --- a/README.asc
> > +++ b/README.asc
> > @@ -1,3 +1,9 @@
> > +change 1
> > +
> > +
> > +
> > +
> > +
> > = Pro Git, Second Edition
> >
> > Welcome to the second edition of the Pro Git book.
> > Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?
> >
> > but if i start with "git add -i", there seems to be no way to get to
> > patch mode -- certainly "p" doesn't do it. am i stupidly missing
> > something trivial? is the explanation misleading or inncomplete?
>
> Worksforme™:
>
> $ echo "New content" >>README.md
> $ echo "New content" >>t/README
> $ echo "New content" >>contrib//README
> $ git add -i
> staged unstaged path
> 1: unchanged +1/-0 README.md
> 2: unchanged +1/-0 contrib/README
> 3: unchanged +1/-0 t/README
>
> *** Commands ***
> 1: status 2: update 3: revert 4: add untracked
> 5: patch 6: diff 7: quit 8: help
> What now> p
> staged unstaged path
> 1: unchanged +1/-0 README.md
> 2: unchanged +1/-0 contrib/README
> 3: unchanged +1/-0 t/README
> Patch update>> 1
> staged unstaged path
> * 1: unchanged +1/-0 README.md
> 2: unchanged +1/-0 contrib/README
> 3: unchanged +1/-0 t/README
> Patch update>> 2
> staged unstaged path
> * 1: unchanged +1/-0 README.md
> * 2: unchanged +1/-0 contrib/README
> 3: unchanged +1/-0 t/README
> Patch update>>
>
> Here I hit enter. Did you?
perhaps i'm just not seeing it, but from "man git-add", it doesn't
seem obvious that you would first select the files to work with, then
hit a simple CR to get into actual patch mode.
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca/dokuwiki
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
