git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: file disappears after git rebase (missing one commit)

From
TSTorgil Svensson <torgil.svensson@gmail.com>
Date
Aug 18, 2007, 21:11 UTC
Message-ID
<e7bda7770708181411v67730b57ibcd8df44695e036f@mail.gmail.com>
In-Reply-To
<alpine.LFD.0.999.0708181334200.30176@woody.linux-foundation.org>
On 8/18/07, Linus Torvalds <torvalds@linux-foundation.org> wrote:
Show 6 quoted lines
> 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
Previous: Linus TorvaldsNext: Linus Torvalds
Message 5 of 6 in “file disappears after git rebase (missing one commit)”
  1. Torgil SvenssonAug 18, 2007
  2. Linus TorvaldsAug 18, 2007
  3. Torgil SvenssonAug 18, 2007
  4. Linus TorvaldsAug 18, 2007
  5. Torgil SvenssonAug 18, 2007
  6. Take binary diffs into account for "git rebase"Linus Torvalds, Aug 18, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.