From: "Torgil Svensson" <torgil.svensson@gmail.com>
To: "Linus Torvalds" <torvalds@linux-foundation.org>
Cc: "Git Mailing List" <git@vger.kernel.org>,
msysGit <msysgit@googlegroups.com>
Subject: Re: file disappears after git rebase (missing one commit)
Date: Sat, 18 Aug 2007 23:11:36 +0200 [thread overview]
Message-ID: <e7bda7770708181411v67730b57ibcd8df44695e036f@mail.gmail.com> (raw)
In-Reply-To: <alpine.LFD.0.999.0708181334200.30176@woody.linux-foundation.org>
On 8/18/07, Linus Torvalds <torvalds@linux-foundation.org> wrote:
> Yeah, I was thinking about the external "git-patch-id" program, which
> actually takes the diff and looks at it from there. But
> "--ignore-if-in-upstream" does its own binary file testing, and doesn't
> use the generic diff code at all.
>
> So the following patch is likely much better..
This patch made the difference and solved the issue for me. Thanks
//Torgil
next prev parent reply other threads:[~2007-08-18 21:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-18 19:37 file disappears after git rebase (missing one commit) Torgil Svensson
2007-08-18 20:01 ` Linus Torvalds
2007-08-18 20:29 ` Torgil Svensson
2007-08-18 20:55 ` Linus Torvalds
2007-08-18 21:11 ` Torgil Svensson [this message]
2007-08-18 22:52 ` Take binary diffs into account for "git rebase" Linus Torvalds
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=e7bda7770708181411v67730b57ibcd8df44695e036f@mail.gmail.com \
--to=torgil.svensson@gmail.com \
--cc=git@vger.kernel.org \
--cc=msysgit@googlegroups.com \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).