From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Jun 2012 22:09:19 GMT
Subject: Re: [PATCH v2 1/2] rebase -i: support --root without --onto
Message-ID: <7vbok5afow.fsf@alter.siamese.dyndns.org>
In-Reply-To: <8d50b9665c6b31af25464f92ada57da90c2ca8a7.1340747724.git.chris@arachsys.com>

Chris Webb <chris@arachsys.com> writes:

> +		# 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.