unpack-trees: rename 'is_excluded_from_list()'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 6294dbc09d213815fb3a31328de87af52fcf606a..c01cfa659529b1fc69026fea790725a0f91c9731 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -100,6 +100,10 @@ commit or stash your changes before running 'git merge'.
 'git merge --abort' is equivalent to 'git reset --merge' when
 `MERGE_HEAD` is present.
 
+--quit::
+       Forget about the current merge in progress. Leave the index
+       and the working tree as-is.
+
 --continue::
        After a 'git merge' stops due to conflicts you can conclude the
        merge by running 'git merge --continue' (see "HOW TO RESOLVE