From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 09 Jun 2011 19:40:19 GMT
Subject: Re: Command-line interface thoughts
Message-ID: <7v4o3yyesc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <BANLkTikLWuENTpCF9BXPJWawLUpKW0077A@mail.gmail.com>

Jay Soffian <jaysoffian@gmail.com> writes:

>>  # what does the result look if I said "commit -a" now?
>>  $ git diff HEAD
>
> I never use commit -a.

Well I said 'commit -a' only so that any newbie can understand what I
meant, and certainly didn't mean to suggest you to use 'commit -a'.  You
can rephrase it as: "Now I _think_ I have good state in my working tree;
what is the change since HEAD, i.e. the result of the merge?".


>>  # I want to also see comparison with the original
>>  $ git checkout --conflict=diff3 <conflicted paths>...
>>  $ git diff
>
> I have merge.conflictstyle diff3 in my .gitconfig.

Good for you.

> ...
> Now that's one I haven't used before.

Surely there is room for everybody to learn something every day ;-).