Junio C Hamano 227124b271 Merge branch 'uk/merge-subtree-doc-update' into maint ...

Belated documentation update to adjust to a new world order that
happened a yew years ago.

* uk/merge-subtree-doc-update:
  howto/using-merge-subtree: mention --allow-unrelated-histories

2018-11-21 22:58:08 +09:00

..

keep-canonical-history-correct.txt

…

maintain-git.txt

…

new-command.txt

…

rebase-from-internal-branch.txt

…

rebuild-from-update-hook.txt

…

recover-corrupted-blob-object.txt

…

recover-corrupted-object-harder.txt

t/helper: merge test-sha1 into test-tool

2018-03-27 08:45:47 -07:00

revert-a-faulty-merge.txt

…

revert-branch-rebase.txt

…

separating-topic-branches.txt

…

setup-git-server-over-http.txt

…

update-hook-example.txt

doc: fix a typo and clarify a sentence

2018-10-11 09:39:15 +09:00

use-git-daemon.txt

…

using-merge-subtree.txt

howto/using-merge-subtree: mention --allow-unrelated-histories

2018-10-25 14:45:15 +09:00

using-signed-tag-in-pull-request.txt

…