| commit | 95f8ebbfc7997b3114d4f09360501324905c4e6d | |
| author | Olivier Marin <dkr@freesurf.fr> | |
| Mon, 21 Jul 2008 13:39:06 +0000 (21 15:39 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jul 2008 07:06:04 +0000 (22 00:06 -0700) | ||
| tree | 905c1d73221181f53840b5d7a995581181f30030 | treesnapshot (tar.gz zip) |
| parent | d1f63a37caae19314bbd55c9fe3554d2e53537e7 | commitdiff |
git am --skip: clean the index while preserving local changes
In 3-way merge, "am" will let the index with unmerged path waiting
for us to resolve conflicts and continue. But if we want to --skip
instead, "am" refuses to continue because of the dirty index.
With this patch, "am" will clean the index without touching files
locally modified, before continuing.
Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In 3-way merge, "am" will let the index with unmerged path waiting
for us to resolve conflicts and continue. But if we want to --skip
instead, "am" refuses to continue because of the dirty index.
With this patch, "am" will clean the index without touching files
locally modified, before continuing.
Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-am.sh | diffblobblamehistory | |
| t/t4151-am-abort.sh | diffblobblamehistory |