Re: `git merge --abort` does not run `git rerere clear`

2018-06-12 Thread Sam Kuper
On 12/06/2018, Junio C Hamano wrote: > Sam Kuper writes: >> [...] It makes sense that `git am [--skip|--abort]` and `git rebase >> [--skip|--abort]` would run `git rerere clear`. >> >> However, if they run it, then shouldn't `git merge --abort` run it, too? >> >> If not, then what is the reason

Re: `git merge --abort` does not run `git rerere clear`

2018-06-12 Thread Junio C Hamano
Sam Kuper writes: > `man git-rerere` says: > >> clear >> >> Reset the metadata used by rerere if a merge resolution is to be >> aborted. Calling git am [--skip|--abort] or git rebase >> [--skip|--abort] will automatically invoke this command. > > It makes sense that `git am [--skip|--abort]` and

`git merge --abort` does not run `git rerere clear`

2018-06-12 Thread Sam Kuper
`man git-rerere` says: > clear > > Reset the metadata used by rerere if a merge resolution is to be > aborted. Calling git am [--skip|--abort] or git rebase > [--skip|--abort] will automatically invoke this command. It makes sense that `git am [--skip|--abort]` and `git rebase [--skip|--abort]`