summaryrefslogtreecommitdiff
path: root/mailmap.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 14:05:11 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-19 14:05:11 -0700
commit8ec959fbcec5f12925eb0a4a60e789a818fdccb9 (patch)
tree91d4bb1390bf4738123db1567e83565ef9e302cd /mailmap.c
parent92ea1ac8267a14f4eae55f175ac7ff0aeaaddc89 (diff)
parent0fa7f01635aa0356823d5cbb5109f61b0f307e4b (diff)
downloadgit-8ec959fbcec5f12925eb0a4a60e789a818fdccb9.tar.gz
Merge branch 'jk/prompt-stash-could-be-packed' into maint
* jk/prompt-stash-could-be-packed: git-prompt: do not look for refs/stash in $GIT_DIR
Diffstat (limited to 'mailmap.c')
0 files changed, 0 insertions, 0 deletions