From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Fri, 29 Mar 2019 10:38:55 +0000 (+0700)
Subject: doc: document --overwrite-ignore
X-Git-Tag: v2.23.0-rc0~64^2~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9d223d43e5270a194902e2916ac0995cc1ba4524?ds=sidebyside;hp=9d223d43e5270a194902e2916ac0995cc1ba4524

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>
---