Re: What's cooking in git.git (Nov 2016, #05; Wed, 23)
W dniu 24.11.2016 o 00:21, Junio C Hamano pisze:
Show 8 quoted lines
> * nd/rebase-forget (2016-10-28) 1 commit
> - rebase: add --forget to cleanup rebase, leave HEAD untouched
>
> "git rebase" learned "--forget" option, which allows a user to
> remove the metadata left by an earlier "git rebase" that was
> manually aborted without using "git rebase --abort".
>
> Waiting for a reroll.
It's always a good thing to stop requiring messing with .git insides.
Show 11 quoted lines
> * jc/reset-unmerge (2016-10-24) 1 commit
> - reset: --unmerge
>
> After "git add" is run prematurely during a conflict resolution,
> "git diff" can no longer be used as a way to sanity check by
> looking at the combined diff. "git reset" learned a new
> "--unmerge" option to recover from this situation.
>
> Will discard.
> This may not be needed, given that update-index has a similar
> option.
OTOH update-index is considered plumbing, so having "git reset --unmerge"
might be good thing (note that we can re-checkout file merge).
> * jc/merge-drop-old-syntax (2015-04-29) 1 commit
Show 9 quoted lines
> (merged to 'next' on 2016-10-11 at 8928c8b9b3)
> + merge: drop 'git merge <message> HEAD <commit>' syntax
>
> Stop supporting "git merge <message> HEAD <commit>" syntax that has
> been deprecated since October 2007, and issues a deprecation
> warning message since v2.5.0.
>
> Will cook in 'next'.
>
Jakub Narębski <jnareb@gmail.com>