[PATCH v2 02/19] doc: document --overwrite-ignore
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2019-02-08 09:04:36
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted> --- Documentation/git-checkout.txt | 5 +++++ Documentation/git-merge.txt | 4 ++++ 2 files changed, 9 insertions(+)
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index bc7fbdb8d2..9ac01f7967 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt@@ -270,6 +270,11 @@ 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. +--[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. + --[no-]recurse-submodules:: Using --recurse-submodules will update the content of all initialized submodules according to the commit recorded in the superproject. If
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4cc86469f3..0480e9d0f0 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt@@ -87,6 +87,10 @@ will be appended to the specified message. Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible. +--[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.
--
2.20.1.682.gd5861c6d90