projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2102440) | patch
merge script: --squash, --ff from unborn branch are errors
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:03:07 +0000 (02:03 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
commit22e0560a70f4b5bfbbf571647e03fa154a6d6bd1
tree24d958936314579dc1289bfec87a54020a7c0662tree | snapshot
parent2102440c17f990fcb5c9269459c39c6312e80d1ccommit | diff
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>
contrib/examples/git-merge.sh diff | blob | history
Git—the stupid content tracker