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/RelNotes/2.6.2.txt | |
| parent | git-checkout.txt: fix one syntax line (diff) | |
| download | tgif-9d223d43e5270a194902e2916ac0995cc1ba4524.tar.xz | |
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/RelNotes/2.6.2.txt')
0 files changed, 0 insertions, 0 deletions