On Fri, Mar 29, 2019 at 3:39 AM Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote: > > This adds a new command 'git-switch' as the half-replacement for > 'git-checkout'. Jump to 13/27 as the starting point. The other half is > git-restore, which is dealt with separately. > > The sixth time must be the charm, because the seventh time may be the > curse! > > The last big change since v5 is from the discussion about > remove_branch_state() and its relation with --ignore-in-progress. By > popular demand, --ignore-in-progress is gone. The discussion is linked > in 23/27, which is also improved to suggest a way out. > > That discussion also leads to a new patch, 07/27, which improves 'git > checkout' and tells the user when merge/revert/cherry-pick is canceled. > > The rest is just minor updates here and there. And I made sure the > sign-off is back this time :D I looked through the range-diff and it looks good to me. I think the safety we added to switch could also be added to checkout, and I think we're narrowing down on how to safely support --ignore-in-progress in certain situations, but both of those things could go in after this series lands...and both might generate more discussion that doesn't need to derail the rest of this series.
