| commit | f07df52489c78c33c5c5c1bd973038283c401582 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Tue, 17 Aug 2010 07:10:17 +0000 (17 02:10 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 21:02:05 +0000 (18 14:02 -0700) | ||
| tree | a575b81623a2766dce1188e37dd76d45e92c4804 | treesnapshot (tar.gz zip) |
| parent | d9a680acf68caef16b5f316ed7917d8160d3578a | commitdiff |
merge script: --ff-only to disallow true merge
Port v1.6.6-rc0~62^2 (Teach 'git merge' and 'git pull' the option
--ff-only, 2009-10-29) 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.6-rc0~62^2 (Teach 'git merge' and 'git pull' the option
--ff-only, 2009-10-29) 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 |