Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jn/merge-no-edit-fix'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Feb 2012 06:41:51 +0000
(22:41 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Feb 2012 06:41:51 +0000
(22:41 -0800)
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Conflicts:
builtin/merge.c
1
2
builtin/merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
b6b3b6a
3adab6f
)
diff --cc
builtin/merge.c
Simple merge