development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
59934 commits 6 branches 951 tags 512 MiB
Commit graph

4 commits

Author SHA1 Message Date
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 e379fdf34f ("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
Jim Meyering a7793a7491 correct spelling: an URL -> a URL 
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-28 08:47:23 -07:00
Uwe Kleine-König 59ab4eb36e Documentation/merge subtree How-To: fix typo 
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-02-09 14:03:51 -08:00
Miklos Vajna 471a5ce5dd Add using merge subtree How-To 
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-01-14 18:04:51 -08:00