Re: git-walkthrough-add script

From: Pedro Melo <melo@simplicidade.org>
Date: Jan 5, 2008, 04:08 UTC
Message-ID: <0F790B89-2FFB-4C54-A109-E55E1FB57D3B@simplicidade.org>
In-Reply-To: <7vprwhf0kf.fsf@gitster.siamese.dyndns.org>

On Jan 5, 2008, at 2:50 AM, Junio C Hamano wrote:

Show 18 quoted lines

> They are meant to be different.
>
>     $ git reset --hard
>     $ echo >>Makefile
>     $ echo >>psql/Makefile
>     $ git add -p
>     diff --git a/Makefile b/Makefile
>     index a2177bc..eb250b0 100644
>     --- a/Makefile
>     +++ b/Makefile
>     @@ -54,3 +54,4 @@ snapdiff ::
>             latest=`ls -1dr $(_snap)/release-????-??-?? | head -n  
> 1` &&
>             \
>             diff -X dontdiff -ru "$$latest" .
>
>     +
>     Stage this hunk [y/n/a/d/?]? ^C

BTW, I'm using 1.5.4rc2 and this prompt shows:

Stage this hunk [y/n/a/d/j/J/?]?

but the help (after you press ?) also mentions:

k - leave this hunk undecided, see previous undecided hunk K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks

but those three options don't seem to work.

Best regards,

-- 
Pedro Melo
Blog: http://www.simplicidade.org/notes/
XMPP ID: melo@simplicidade.org
Use XMPP!