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>
Nguyễn Thái Ngọc Duy committed
Mar 29, 2019 at 17:38 UTC
9d223d43e5270a194902e2916ac0995cc1ba4524
2 files changed
+11
Documentation/git-checkout.txt
+6
@@ -271,6 +271,12 @@ Note that this option uses the no overlay mode by default (see also
271
out anyway. In other words, the ref can be held by more than one
272
worktree.
273
274
+--overwrite-ignore::
275
+--no-overwrite-ignore::
276
+ Silently overwrite ignored files when switching branches. This
277
+ is the default behavior. Use `--no-overwrite-ignore` to abort
278
+ the operation when the new branch contains ignored files.
279
+
280
--recurse-submodules::
281
--no-recurse-submodules::
282
Using --recurse-submodules will update the content of all initialized
Documentation/git-merge.txt
+5
@@ -87,6 +87,11 @@ will be appended to the specified message.
87
Allow the rerere mechanism to update the index with the
88
result of auto-conflict resolution if possible.
89
90
+--overwrite-ignore::
91
+--no-overwrite-ignore::
92
+ Silently overwrite ignored files from the merge result. This
93
+ is the default behavior. Use `--no-overwrite-ignore` to abort.
94
+
95
--abort::
96
Abort the current conflict resolution process, and
97
try to reconstruct the pre-merge state.