summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-01-06 12:44:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-06 12:44:03 -0800
commit4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 (patch)
tree8aa05c695e7db70270d1473f40c4db0409f1d9d2 /pretty.c
parentMerge branch 'jh/fetch-head-update' (diff)
parentstash: Don't fail if work dir contains file named 'HEAD' (diff)
downloadtgif-4a3a1edd0be1c5254ae4fc66e06297d87ef7d530.tar.xz
Merge branch 'jm/stash-diff-disambiguate'
* jm/stash-diff-disambiguate: stash: Don't fail if work dir contains file named 'HEAD'
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions