Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ao/merge-verbosity-getenv-just-once'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 15 Nov 2017 03:14:28 +0000
(12:14 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 15 Nov 2017 03:14:28 +0000
(12:14 +0900)
Code cleanup.
* ao/merge-verbosity-getenv-just-once:
merge-recursive: check GIT_MERGE_VERBOSITY only once
1
2
merge-recursive.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
ffb0b57
8048622
)
diff --cc
merge-recursive.c
Simple merge