summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-06 21:53:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-06 21:53:12 (GMT)
commit51d517b9bbb58904a3f9ded068d7f111620a4db4 (patch)
treea06b6fe76ea045fba3c49db276ee699fb3196316 /git-mergetool.sh
parentf0798e6cdbf99515391242e20f8df495a14e9c22 (diff)
parente94ce1394e17e1b91b943b8d41131b6aadb96b88 (diff)
downloadgit-51d517b9bbb58904a3f9ded068d7f111620a4db4.zip
git-51d517b9bbb58904a3f9ded068d7f111620a4db4.tar.gz
git-51d517b9bbb58904a3f9ded068d7f111620a4db4.tar.bz2
Merge branch 'sg/ref-filter-parse-optim'
The code that parses the format parameter of for-each-ref command has seen a micro-optimization. * sg/ref-filter-parse-optim: ref-filter: strip format option after a field name only once while parsing
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions