diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-03 15:10:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-03 15:10:22 -0700 |
| commit | c0728edfb676588d9c47738889445450efea94e0 (patch) | |
| tree | 77700fcf3032e144840b48a1db43def285399396 /builtin/commit.c | |
| parent | a35031240b8d47ce89d7738ccfd3473073b5a823 (diff) | |
| parent | 0f12c7d4d175bb0566208213b1b340b6794f305c (diff) | |
| download | git-c0728edfb676588d9c47738889445450efea94e0.tar.gz | |
Merge branch 'da/subtree-2.9-regression'
"git merge" in Git v2.9 was taught to forbid merging an unrelated
lines of history by default, but that is exactly the kind of thing
the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
"git subtree" has been taught to use the "--allow-unrelated-histories"
option to override the default.
* da/subtree-2.9-regression:
subtree: fix "git subtree split --rejoin"
t7900-subtree.sh: fix quoting and broken && chains
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions