README: Use pull and add --allow-unrelated-histories
authorW. Trevor King <wking@tremily.us>
Wed, 11 Oct 2017 18:29:53 +0000 (11:29 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 11 Oct 2017 18:45:16 +0000 (11:45 -0700)
commita2127c2b85853795b2bd05b942c43ebe230cb230
tree5f709e6982d16d09185500fe62481d85f49787a7
parentd8badefa8b2b1a1bb2c8b2e3bee84569f5803670
README: Use pull and add --allow-unrelated-histories

Using pull gets us down to a single command, leaves no local remote,
and results in a more-descriptive commit message:

  Merge branch 'signed-off-by' of git://tremily.us/signed-off-by

vs. the old:

  Merge branch 'signed-off-by' of s-o-b

--allow-unrelated-histories is required for this sort of thing since
e379fdf3 (merge: refuse to create too cool a merge by default,
2016-03-18, v2.9.0 [1]) and 09c2cb87 (pull: pass
--allow-unrelated-histories to "git merge", 2016-03-18, v2.9.0 [2]).

[1]: https://github.com/git/git/commit/e379fdf34fee96cd205be83ff4e71699bdc32b18
[2]: https://github.com/git/git/commit/09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4

Signed-off-by: W. Trevor King <wking@tremily.us>
README