| commit | c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Tue, 17 Aug 2010 07:11:30 +0000 (17 02:11 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 21:02:05 +0000 (18 14:02 -0700) | ||
| tree | 336f75668bffdb70e92dcdb0cbf5b4769260ef6f | treesnapshot (tar.gz zip) |
| parent | 2a70fa4f1e377bc68bcabdc1a550e9970acccda7 | commitdiff |
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>
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 | diffblobblamehistory |