summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-09 12:54:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-09 12:54:08 -0700
commit64014894cfd29114a6b60cc501f06a68b5f3606b (patch)
treeb1a9c1fe4fc1d3708a5dd4dac9ea4b5cf23a3042 /.mailmap
parentMerge branch 'tb/pretty-format-cd-date-format' (diff)
parentgit-prompt: do not look for refs/stash in $GIT_DIR (diff)
downloadtgif-64014894cfd29114a6b60cc501f06a68b5f3606b.tar.xz
Merge branch 'jk/prompt-stash-could-be-packed'
The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * jk/prompt-stash-could-be-packed: git-prompt: do not look for refs/stash in $GIT_DIR
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions