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

Re: [PATCH 1/2] rebase -i -p: handle index and workdir correctly

From
Thomas Rast <trast@student.ethz.ch>
Date
Aug 13, 2008, 10:07 UTC
Message-ID
<200808131207.31616.trast@student.ethz.ch>
In-Reply-To
<8bbecf58e7fba14497720afe5cdaf52fec6bcb40.1218621695.git.trast@student.ethz.ch>
Thomas Rast wrote:
> -		test $preserve = f || echo $sha1 > "$REWRITTEN"/$sha1
> +		output git reset --hard $sha1 ||
> +			die "Cannot fast forward to $sha1"
Doh.  I obviously shouldn't try to split patches before lunch.
Please disregard, I'll fix and resend when I get back.
-- 
Thomas Rast
trast@student.ethz.ch
Previous: Thomas RastNext: Thomas Rast
Message 4 of 10 in “[BUG?] rebase -i -p leaves index changed”
  1. Thomas RastAug 12, 2008
  2. 1/2 rebase -i -p: handle index and workdir correctlyThomas Rast, Aug 13, 2008
  3. 2/2 rebase -i -p: fix parent rewritingThomas Rast, Aug 13, 2008
  4. Thomas RastAug 13, 2008
  5. 1/2 rebase -i -p: handle index and workdir correctlyThomas Rast, Aug 13, 2008
  6. 2/2 rebase -i -p: fix parent rewritingThomas Rast, Aug 13, 2008
  7. Stephan BeyerAug 13, 2008
  8. 1/2 rebase -i -p: handle index and workdir correctlyThomas Rast, Aug 13, 2008
  9. 2/2 rebase -i -p: fix parent rewritingThomas Rast, Aug 13, 2008
  10. Stephan BeyerAug 13, 2008

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.