summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-05 15:25:12 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-05 15:25:12 -0800
commit9ef569791f967c1559b498d8f77a2c42a14be2ed (patch)
treeafd2b29be852150fd4f74d57e257ab47729ca86c /builtin/commit.c
parentce8781e8ab66fb90fb7baf8d953a4582a06571a7 (diff)
parentfc001b526c42e5fb776340136a2fb247e391a61b (diff)
downloadgit-9ef569791f967c1559b498d8f77a2c42a14be2ed.tar.gz
Merge branch 'nd/maint-ignore-exclude'
* nd/maint-ignore-exclude: checkout,merge: loosen overwriting untracked file check based on info/exclude
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions