Uwe Kleine-König 5e495f8122 howto/using-merge-subtree: mention --allow-unrelated-histories ...

Without passing --allow-unrelated-histories the command sequence
fails as intended since commit e379fdf34fee ("merge: refuse to create
too cool a merge by default"). To setup a subtree merging unrelated
histories is normal, so add the option to the howto document.

Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

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

..

keep-canonical-history-correct.txt

How to keep a project's canonical history correct.

2014-05-28 13:35:43 -07:00

maintain-git.txt

howto/maintain-git.txt: new version numbering scheme

2014-02-05 14:14:00 -08:00

new-command.txt

new-command.txt: correct the command description file

2016-06-27 06:11:57 -07:00

rebase-from-internal-branch.txt

Documentation: fix misuses of "nor"

2014-03-31 15:16:22 -07:00

rebuild-from-update-hook.txt

doc: use https links to avoid http redirect

2017-04-20 22:05:37 -07:00

recover-corrupted-blob-object.txt

The name of the hash function is "SHA-1", not "SHA1"

2013-04-15 11:08:37 -07:00

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

doc: fix the 'revert a faulty merge' ASCII art tab spacing

2016-10-24 18:09:46 -07:00

revert-branch-rebase.txt

Documentation: fix misuses of "nor"

2014-03-31 15:16:22 -07:00

separating-topic-branches.txt

Documentation/howto: convert plain text files to asciidoc

2012-10-18 10:51:34 -07:00

setup-git-server-over-http.txt

Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues

2014-05-21 13:57:10 -07:00

update-hook-example.txt

Documentation/howto: convert plain text files to asciidoc

2012-10-18 10:51:34 -07:00

use-git-daemon.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

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

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00