mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: document --overwrite-ignore

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2019-03-29 17:38:55 +07:00
committed by Junio C Hamano
parent 37f80025cd
commit 9d223d43e5
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-checkout.txt
View File

@ -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 out anyway. In other words, the ref can be held by more than one
worktree. 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:: --recurse-submodules::
--no-recurse-submodules:: --no-recurse-submodules::
Using --recurse-submodules will update the content of all initialized Using --recurse-submodules will update the content of all initialized

5
Documentation/git-merge.txt
View File

@ -87,6 +87,11 @@ will be appended to the specified message.
Allow the rerere mechanism to update the index with the Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible. 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::
Abort the current conflict resolution process, and Abort the current conflict resolution process, and
try to reconstruct the pre-merge state. try to reconstruct the pre-merge state.