Re: [PATCH v2 02/23] rebase -i: allow squashing empty commits without complaints

Thanks for working on this. On Wed, Aug 6, 2014 at 7:59 PM, Fabian Ruch baf...@gmail.com wrote: The to-do list commands `squash` and `fixup` apply the changes introduced by the named commit to the tree but instead of creating a new commit on top of the current head it replaces the previous

Re: [PATCH v2 02/23] rebase -i: allow squashing empty commits without complaints

Hi Eric, Eric Sunshine writes: On Wed, Aug 6, 2014 at 7:59 PM, Fabian Ruch baf...@gmail.com wrote: The to-do list commands `squash` and `fixup` apply the changes introduced by the named commit to the tree but instead of creating a new commit on top of the current head it replaces the previous

Re: [PATCH v2 02/23] rebase -i: allow squashing empty commits without complaints

Fabian Ruch: 2. Notice ourselves that the end-result of the whole squash is an empty commit, and stop to let the user deal with it. This patch chooses the second alternative. Either way seems OK. The crucial consensus of the discussion was to silently throw away empty interim

Re: [PATCH v2 02/23] rebase -i: allow squashing empty commits without complaints

On Wed, Aug 6, 2014 at 7:59 PM, Fabian Ruch baf...@gmail.com wrote: The to-do list commands `squash` and `fixup` apply the changes introduced by the named commit to the tree but instead of creating a new commit on top of the current head it replaces the previous commit with a new commit that

[PATCH v2 02/23] rebase -i: allow squashing empty commits without complaints

The to-do list commands `squash` and `fixup` apply the changes introduced by the named commit to the tree but instead of creating a new commit on top of the current head it replaces the previous commit with a new commit that records the updated tree. If the result is an empty commit git-rebase