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

Re: [RFC] Replace rebase with filtering

From
Junio C Hamano <junkio@cox.net>
Date
Jan 16, 2007, 22:53 UTC
Message-ID
<7vwt3mwpll.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.63.0701162350150.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 5 quoted lines
>> I'd put a simple patch to add the reset to git-merge.sh, but I'm not sure I
>> understand what --skip is doing in there with a 30 second peek.
>
> Better put "git reset --hard" into git-rebase.sh... Just search for 
> "--skip" and you will find where it has to go.

I'd later want to allow starting rebase from a dirty working tree as long as the rebasing of the entire series would not conflict with the local changes, so I would seriously prefer a solution without "reset --hard".

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 14 of 16 in “[RFC] Replace rebase with filtering”
  1. Steven GrimmJan 16, 2007
  2. Johannes SchindelinJan 16, 2007
  3. Steven GrimmJan 16, 2007
  4. Steven GrimmJan 16, 2007
  5. Johannes SchindelinJan 16, 2007
  6. Steven GrimmJan 16, 2007
  7. Jakub NarebskiJan 16, 2007
  8. Shawn O. PearceJan 16, 2007
  9. Johannes SchindelinJan 16, 2007
  10. Johannes SchindelinJan 16, 2007
  11. Jakub NarebskiJan 16, 2007
  12. Brian GernhardtJan 16, 2007
  13. Johannes SchindelinJan 16, 2007
  14. Junio C HamanoJan 16, 2007
  15. Johannes SchindelinJan 16, 2007
  16. Steven GrimmJan 17, 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.