On Fri, Jul 13, 2018 at 9:33 AM, Elijah Newren wrote:
> This patch series fixes several "recovery" commands that outright fail
> or do not fully recover when directory-file conflicts are present.
> This includes:
>* git read-tree --reset HEAD
>* git am --skip
>* git am --abort
>* g
This patch series fixes several "recovery" commands that outright fail
or do not fully recover when directory-file conflicts are present.
This includes:
* git read-tree --reset HEAD
* git am --skip
* git am --abort
* git merge --abort (or git reset --merge)
* git reset --hard
Change
2 matches
Mail list logo