summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-16 22:18:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-16 22:18:03 (GMT)
commit57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15 (patch)
tree51190ea5290587ff961cc5ee9e379fb78a7b9026 /builtin/checkout.c
parentf3f3c4dec6351cb875bdd24e685f2e613eb249c1 (diff)
parentf026358ef20e0c252388a41fcc8eff125b00927c (diff)
downloadgit-57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15.zip
git-57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15.tar.gz
git-57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15.tar.bz2
Merge branch 'jc/maint-mailmap-output' into maint
* jc/maint-mailmap-output: mailmap: always return a plain mail address from map_user()
Diffstat (limited to 'builtin/checkout.c')
0 files changed, 0 insertions, 0 deletions