diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:11 -0700 |
commit | 8ec959fbcec5f12925eb0a4a60e789a818fdccb9 (patch) | |
tree | 91d4bb1390bf4738123db1567e83565ef9e302cd /xdiff-interface.h | |
parent | Merge branch 'rs/refresh-beyond-symlink' into maint (diff) | |
parent | git-prompt: do not look for refs/stash in $GIT_DIR (diff) | |
download | tgif-8ec959fbcec5f12925eb0a4a60e789a818fdccb9.tar.xz |
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 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions