projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9def213
e0ec181
)
Merge branch 'sb/merge-friendly'
author
Junio C Hamano
<junkio@cox.net>
Sun, 24 Dec 2006 10:18:35 +0000
(
02:18
-0800)
committer
Junio C Hamano
<junkio@cox.net>
Sun, 24 Dec 2006 10:18:35 +0000
(
02:18
-0800)
* sb/merge-friendly:
Display 'theirs' branch name when possible in merge.
Use extended SHA1 syntax in merge-recursive conflicts.
Trivial merge
projects / git.git / commitdiff