Merge branch 'ma/up-to-date'
commit8e36002adda45a35c6fc4daf81913c3d2102cb59
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:08:22 +0000 (10 17:08 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:08:22 +0000 (10 17:08 +0900)
treee3640ac0242262814f2b2d4c2a01c4332faeb18c
parenta48ce378585054f2ae3b2f0e18346ab005290524
parent7560f547e614244fe1d4648598d4facf7ed33a56
Merge branch 'ma/up-to-date'

Message and doc updates.

* ma/up-to-date:
  treewide: correct several "up-to-date" to "up to date"
  Documentation/user-manual: update outdated example output
Documentation/git-merge.txt
Documentation/githooks.txt
builtin/merge.c
git-merge-octopus.sh
notes-merge.c
remote.c
t/t6040-tracking-info.sh
unpack-trees.c