Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/alias'
author
Junio C Hamano
<junkio@cox.net>
Tue, 6 Jun 2006 23:42:46 +0000
(16:42 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 6 Jun 2006 23:42:46 +0000
(16:42 -0700)
* js/alias:
git alias: try alias last.
If you have a config containing something like this:
raw
|
combined
(merge:
ad0e0b0
a025463
)
Trivial merge