How to make 'git pull' take a message?

Well, here we go again with more Git goodness. It has found other ways to make simple tasks difficult to impossible...

git pull -X theirs https://github.com/weidai11/cryptopp.git master
From https://github.com/weidai11/cryptopp
 * branch            master     -> FETCH_HEAD
Auto-merging GNUmakefile
error: cannot spawn notepad++.exe: No such file or directory
error: unable to start editor 'notepad++.exe'
Not committing merge; use 'git commit' to complete the merge.

notepad++.exe is where nearly every other Windows executable is located. Its in program files. Its not a secret, and its not a hidden location.

Try again so it stops wasting my time with useless crap:

# Rewind past broken git
git checkout HEAD~3 -f

# Back to master
git checkout master -f

# Tray again; avoid the prompt
$ git pull -X theirs -m "Sync with Upstream master" https://github.com/weidai11/cryptopp.git master
error: unknown switch `m'
usage: git pull [<options>] [<repository> [<refspec>...]]

    -v, --verbose         be more verbose
    -q, --quiet           be more quiet
    --progress            force progress reporting

What is the option to tell Git, "Here's the message to use. Stop confusing yourself. Stop wasting my time with useless crap?"

Thanks in advance

Solution

You can't provide your own message, but the --no-edit option passed to git pull will auto-generate merge messages.

git pull --no-edit