summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorOlivier Marin <dkr@freesurf.fr>2008-07-21 13:39:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-22 07:06:04 (GMT)
commit95f8ebbfc7997b3114d4f09360501324905c4e6d (patch)
tree905c1d73221181f53840b5d7a995581181f30030 /builtin.h
parentd1f63a37caae19314bbd55c9fe3554d2e53537e7 (diff)
downloadgit-95f8ebbfc7997b3114d4f09360501324905c4e6d.zip
git-95f8ebbfc7997b3114d4f09360501324905c4e6d.tar.gz
git-95f8ebbfc7997b3114d4f09360501324905c4e6d.tar.bz2
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>
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions