diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-11-27 17:15:32 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-11-28 10:37:50 -0800 |
| commit | fc001b526c42e5fb776340136a2fb247e391a61b (patch) | |
| tree | 8f88d4cfde012085a03384b1f5a952c8de8541eb /t/t5515/fetch.br-remote-explicit-merge_remote-explicit | |
| parent | Git 1.7.3 (diff) | |
| download | tgif-fc001b526c42e5fb776340136a2fb247e391a61b.tar.xz | |
checkout,merge: loosen overwriting untracked file check based on info/exclude
Back in 1127148 (Loosen "working file will be lost" check in
Porcelain-ish - 2006-12-04), git-checkout.sh learned to quietly
overwrite ignored files. Howver the code only took .gitignore files
into account.
Standard ignored files include all specified in .gitignore files in
working directory _and_ $GIT_DIR/info/exclude. This patch makes sure
ignored files in info/exclude can also be overwritten automatically in
the spirit of the original patch.
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 't/t5515/fetch.br-remote-explicit-merge_remote-explicit')
0 files changed, 0 insertions, 0 deletions