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:
683b4d8
91e70e0
)
Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 11 Sep 2014 17:33:29 +0000
(10:33 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 11 Sep 2014 17:33:30 +0000
(10:33 -0700)
* mm/discourage-commit-a-to-finish-conflict-resolution:
merge, pull: stop advising 'commit -a' in case of conflict
Trivial merge