diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-03-29 17:38:55 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-02 13:56:58 +0900 |
| commit | 9d223d43e5270a194902e2916ac0995cc1ba4524 (patch) | |
| tree | e64210803a35b7eee4c1f8549595a8d81529c977 /Documentation/git-merge.txt | |
| parent | 37f80025cdc5c2fe98039d45678f8ca9c7e36b93 (diff) | |
| download | git-9d223d43e5270a194902e2916ac0995cc1ba4524.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 4cc86469f3..6a9163d8fe 100644 --- 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. +--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. |