OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f8e593e
2bf15a3
)
Merge branch 'jk/merge-quiet'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Apr 2015 18:49:12 +0000
(11:49 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Apr 2015 18:49:12 +0000
(11:49 -0700)
"git merge --quiet" did not squelch messages from the underlying
merge-recursive strategy.
* jk/merge-quiet:
merge: pass verbosity flag down to merge-recursive
1
2
builtin/merge.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
builtin/merge.c
Simple merge