projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9086a18
6ea2334
)
Merge branch 'jc/merge'
author
Junio C Hamano
<junkio@cox.net>
Sun, 26 Mar 2006 08:22:48 +0000
(
00:22
-0800)
committer
Junio C Hamano
<junkio@cox.net>
Sun, 26 Mar 2006 08:22:48 +0000
(
00:22
-0800)
* jc/merge:
git-merge knows some strategies want to skip trivial merges
Trivial merge