aboutsummaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-28 15:46:36 -0700
committerJunio C Hamano <gitster@pobox.com>2014-05-28 15:46:36 -0700
commit12188a82990da099e2f3cf3d37aa4e0362122478 (patch)
tree5755d7852670ac63c51298c4d35aa6893d64aeb3 /git-merge-one-file.sh
parent64d8c31ebe25496c3e5b10b7786a6c4d2a21e15c (diff)
parent1e4119c81b3e203e1729e03be6e4a53eb9207f5c (diff)
downloadgit-12188a82990da099e2f3cf3d37aa4e0362122478.tar.gz
git-12188a82990da099e2f3cf3d37aa4e0362122478.tar.xz
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint
* rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't assume the shell expands the value of PS1
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions