Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
merge script: notice @{-1} shorthand
author
Jonathan Nieder
<jrnieder@gmail.com>
Tue, 17 Aug 2010 07:11:30 +0000
(
02:11
-0500)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 18 Aug 2010 21:02:05 +0000
(14:02 -0700)
Port v1.6.2-rc1~10^2 (Teach @{-1} to git merge, 2009-02-13) to
the old merge script.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
raw
|
patch
|
inline
| side by side (from:
c2c9a87
)
No differences found