From: David Kastrup <dak@gnu.org>
To: git@vger.kernel.org
Subject: Re: Potential bug: truncated diff output
Date: Thu, 16 Jan 2014 07:31:34 +0100 [thread overview]
Message-ID: <87lhyg4eux.fsf@fencepost.gnu.org> (raw)
In-Reply-To: CAAyYaWo7wtsVGGxUeE3wwG6UHZ_qc8wcPu4Dk6=DsF8JtyF6_w@mail.gmail.com
Misha Penkov <misha.penkov@gmail.com> writes:
> I have a file in a git repo. It has changed during the last two
> commits. I want to see the changes made in these two commits. The
> following command should work:
>
> git diff HEAD^^
>
> but that doesn't get me the expected results. Read on for details.
> As I mentioned in the first paragraph, I want to generate a patch that
> includes both commits:
>
> $git diff HEAD^^ HEAD ieicej.cls
> This looks wrong, since it doesn't include the last commit. For
> example, changes to line 3145 are not there. It appears to include
> changes from the second-last commit (e.g. the stuff around line 1714).
>
> My questions:
>
> 1) What am I doing wrong?
You did not commit all your changes. Some of them are either only in
your working directory, or in working directory and index.
> 2) How can I get the diff to include all the commits in their
> entirety?
It did.
> 3) Is this a bug?
No.
--
David Kastrup
next prev parent reply other threads:[~2014-01-16 6:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-16 6:19 Potential bug: truncated diff output Misha Penkov
2014-01-16 6:31 ` David Kastrup [this message]
2014-01-16 6:55 ` Johannes Sixt
2014-01-16 7:04 ` David Kastrup
2014-01-16 7:06 ` Misha Penkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lhyg4eux.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox