doc: document --overwrite-ignore

I added this option in git-checkout and git-merge in c1d7036b6b
(checkout,merge: disallow overwriting ignored files with
--no-overwrite-ignore - 2011-11-27) but did not remember to update
documentation. This completes that commit.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 28817cfa419764261a41598189d4dbd42cfb665e..5280d1f9ed39c561fde4a2cd4a531c1e01e81c0d 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -271,6 +271,12 @@ Note that this option uses the no overlay mode by default (see also
        out anyway. In other words, the ref can be held by more than one
        worktree.
 
        out anyway. In other words, the ref can be held by more than one
        worktree.
 

+--overwrite-ignore::
+--no-overwrite-ignore::
+       Silently overwrite ignored files when switching branches. This
+       is the default behavior. Use `--no-overwrite-ignore` to abort
+       the operation when the new branch contains ignored files.
+

 --recurse-submodules::
 --no-recurse-submodules::
        Using --recurse-submodules will update the content of all initialized
 --recurse-submodules::
 --no-recurse-submodules::
        Using --recurse-submodules will update the content of all initialized

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4cc86469f3dd45564b40b327d1b39f2bb213bb98..6a9163d8fe1129e2e07fd70c2e7d45eb21c122c4 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -87,6 +87,11 @@ will be appended to the specified message.
        Allow the rerere mechanism to update the index with the
        result of auto-conflict resolution if possible.
 
        Allow the rerere mechanism to update the index with the
        result of auto-conflict resolution if possible.
 

+--overwrite-ignore::
+--no-overwrite-ignore::
+       Silently overwrite ignored files from the merge result. This
+       is the default behavior. Use `--no-overwrite-ignore` to abort.
+

 --abort::
        Abort the current conflict resolution process, and
        try to reconstruct the pre-merge state.
 --abort::
        Abort the current conflict resolution process, and
        try to reconstruct the pre-merge state.