Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: > In case git merge --no-ff is used with --no-commit or we have a > conflict, write info about if fast forwards are allowed or not to > $GIT_DIR/MERGE_MODE. *sigh* $ git co -b mv/merge-noff master && git am -s <this $ make test ... *** t0004-unwritable.sh *** * FAIL 1: setup ... $ cd t && ./t0004-unwritable.sh -i -v ... ./test-lib.sh: line 237: 362 Segmentation fault git commit -m initial * FAIL 1: setup I leave the debugging to you. ;-) -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
