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

Re: [PATCH v2 1/2] rebase -i: support --root without --onto

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 26, 2012, 22:09 UTC
Message-ID
<7vbok5afow.fsf@alter.siamese.dyndns.org>
In-Reply-To
<8d50b9665c6b31af25464f92ada57da90c2ca8a7.1340747724.git.chris@arachsys.com>
Chris Webb <chris@arachsys.com> writes:
Show 8 quoted lines
> +		# Set the correct commit message and author info on the
> +		# sentinel root before cherry-picking the original changes
> +		# without committing (-n).  Finally, update the sentinel again
> +		# to include these changes.  If the cherry-pick results in a
> +		# conflict, this means our behaviour is similar to a standard
> +		# failed cherry-pick during rebase, with a dirty index to
> +		# resolve before manually running git commit --amend then git
> +		# rebase --continue.
Thanks; very readable and understandable.
Previous: Chris Webb
Message 3 of 3 in “rebase -i: support --root without --onto”
  1. 1/2 rebase -i: support --root without --ontoChris Webb, Jun 26, 2012
  2. 2/2 Add tests for rebase -i --root without --ontoChris Webb, Jun 26, 2012
  3. Junio C HamanoJun 26, 2012

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.