| commit | 22e0560a70f4b5bfbbf571647e03fa154a6d6bd1 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Tue, 17 Aug 2010 07:03:07 +0000 (17 02:03 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 21:02:04 +0000 (18 14:02 -0700) | ||
| tree | 24d958936314579dc1289bfec87a54020a7c0662 | treesnapshot (tar.gz zip) |
| parent | 2102440c17f990fcb5c9269459c39c6312e80d1c | commitdiff |
merge script: --squash, --ff from unborn branch are errors
Port v1.6.1-rc1~319 (provide more errors for the "merge into empty
head" case, 2008-08-21) to the example merge script.
Noticed by comparison with builtin merge.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Port v1.6.1-rc1~319 (provide more errors for the "merge into empty
head" case, 2008-08-21) to the example merge script.
Noticed by comparison with builtin merge.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/examples/git-merge.sh | diffblobblamehistory |