projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba580ae
61c2bcb
)
Merge branch 'maint'
author
Junio C Hamano
<junkio@cox.net>
Wed, 19 Apr 2006 22:41:55 +0000
(15:41 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 19 Apr 2006 22:41:55 +0000
(15:41 -0700)
* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
Trivial merge
projects / git.git / commitdiff