summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-12 22:42:10 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-12 22:42:10 -0800
commit44a1020d4d41b90be80745c7a16e2a49fa612b56 (patch)
treefd734df8e43fb1dc956ac045eb0a699d09fb1176 /builtin/blame.c
parentMerge branch 'jk/maint-tag-show-fixes' (diff)
parentcommit: ignore intent-to-add entries instead of refusing (diff)
downloadtgif-44a1020d4d41b90be80745c7a16e2a49fa612b56.tar.xz
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 'builtin/blame.c')
0 files changed, 0 insertions, 0 deletions