projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2a70fa4) | patch
merge script: notice @{-1} shorthand
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:11:30 +0000 (02:11 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:05 +0000 (14:02 -0700)
commitc2c9a87d4f5a643ef93db7c39fc01c4965bf67a3
tree336f75668bffdb70e92dcdb0cbf5b4769260ef6ftree | snapshot
parent2a70fa4f1e377bc68bcabdc1a550e9970acccda7commit | diff
merge script: notice @{-1} shorthand

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>
contrib/examples/git-merge.sh diff | blob | history
Git—the stupid content tracker