| commit | fc001b526c42e5fb776340136a2fb247e391a61b | |
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
| Sun, 27 Nov 2011 10:15:32 +0000 (27 17:15 +0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Nov 2011 18:37:50 +0000 (28 10:37 -0800) | ||
| tree | 8f88d4cfde012085a03384b1f5a952c8de8541eb | treesnapshot (tar.gz zip) |
| parent | 87b50542a08ac6caa083ddc376e674424e37940a | commitdiff |
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>
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>
| builtin/checkout.c | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory |