aboutsummaryrefslogtreecommitdiff
path: root/merge-file.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-28 21:18:47 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-28 21:18:47 -0700
commit0b98954975502f56f1de2a4cb0569f7e80fd44d0 (patch)
tree25e591cd0b0743533cf14a3b7a9b5d2620e39671 /merge-file.h
parentd39753c23824f0c384a7932f3772f0ddc25010f7 (diff)
parent53f53cff24c5fe6683234bcd5386a447b8b17074 (diff)
downloadgit-0b98954975502f56f1de2a4cb0569f7e80fd44d0.tar.gz
git-0b98954975502f56f1de2a4cb0569f7e80fd44d0.tar.xz
Merge branch 'di/fast-import-ident'
* di/fast-import-ident: fsck: improve committer/author check fsck: add a few committer name tests fast-import: check committer name more strictly fast-import: don't fail on omitted committer name fast-import: add input format tests
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions