]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ao/merge-verbosity-getenv-just-once'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:14:28 +0000 (12:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:14:28 +0000 (12:14 +0900)
commita6ee796aa85ef96cab1ba866e193eedfda2fb5b6
tree4c53a76b9b1f7a44c38f51c25be63ee22a8ff191
parentffb0b5762e903acc146cb21525f3c643de6facce
parent804862209bcbc29f2e7850ecf29f17c1c1aaae6e
Merge branch 'ao/merge-verbosity-getenv-just-once'

Code cleanup.

* ao/merge-verbosity-getenv-just-once:
  merge-recursive: check GIT_MERGE_VERBOSITY only once
merge-recursive.c