Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
author
Junio C Hamano
<gitster@pobox.com>
Fri, 6 May 2011 22:03:25 +0000
(15:03 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 6 May 2011 22:10:36 +0000
(15:10 -0700)
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>
raw
(from:
541d1fa
)
No differences found