summaryrefslogtreecommitdiff
path: root/help.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-13 06:42:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-13 06:42:10 (GMT)
commit44a1020d4d41b90be80745c7a16e2a49fa612b56 (patch)
treefd734df8e43fb1dc956ac045eb0a699d09fb1176 /help.h
parent1efb73322ad800cc679496124e8a1f498b52e5cb (diff)
parent3f6d56de5f99ec5f0667bef4411f2515b253a5b2 (diff)
downloadgit-44a1020d4d41b90be80745c7a16e2a49fa612b56.zip
git-44a1020d4d41b90be80745c7a16e2a49fa612b56.tar.gz
git-44a1020d4d41b90be80745c7a16e2a49fa612b56.tar.bz2
Merge branch 'jc/maint-commit-ignore-i-t-a'
* jc/maint-commit-ignore-i-t-a: commit: ignore intent-to-add entries instead of refusing Conflicts: cache-tree.c
Diffstat (limited to 'help.h')
0 files changed, 0 insertions, 0 deletions