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

Re: git diff-index and both deleted conflict

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 11, 2011, 17:28 UTC
Message-ID
<7vlj0lzhvv.fsf@alter.siamese.dyndns.org>
In-Reply-To
<201103111947.55412.dmit10@mail.ru>
Dmitry Pavlenko <dmit10@mail.ru> writes:
> that there's "no local changes in the repository (in the working tree and 
> index)" so that I could perform "git rebase" there?

There is a code that lets "git rebase" decide if it can run in the source. Look for require_clean_work_tree in git-sh-setup.sh

Previous: Dmitry Pavlenko
Message 2 of 2 in “git diff-index and both deleted conflict”
  1. Dmitry PavlenkoMar 11, 2011
  2. Junio C HamanoMar 11, 2011

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.