]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-checkout.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 37f8002) | patch
doc: document --overwrite-ignore
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Fri, 29 Mar 2019 10:38:55 +0000 (17:38 +0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Apr 2019 04:56:58 +0000 (13:56 +0900)
commit9d223d43e5270a194902e2916ac0995cc1ba4524
treee64210803a35b7eee4c1f8549595a8d81529c977tree | snapshot
parent37f80025cdc5c2fe98039d45678f8ca9c7e36b93commit | diff
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>
Documentation/git-checkout.txt diff | blob | blame | history
Documentation/git-merge.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.