aboutsummaryrefslogtreecommitdiff
path: root/prompt.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-16 14:08:00 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-16 14:08:00 -0800
commit6c63ab3ca7abc50155acc6c28380435fb79f7fa9 (patch)
tree61f4f31ceb45e7be429055e9a34df66ba69d7764 /prompt.c
parentc6a4e3f7a78011bd7c1c75521c6d12ac311513f7 (diff)
parent3f6d56de5f99ec5f0667bef4411f2515b253a5b2 (diff)
downloadgit-6c63ab3ca7abc50155acc6c28380435fb79f7fa9.tar.gz
git-6c63ab3ca7abc50155acc6c28380435fb79f7fa9.tar.xz
Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
* jc/maint-commit-ignore-i-t-a: commit: ignore intent-to-add entries instead of refusing Conflicts: cache-tree.c
Diffstat (limited to 'prompt.c')
0 files changed, 0 insertions, 0 deletions