Commit 6032421a authored by Aron Helser's avatar Aron Helser Committed by Ben Boeckel

update-common: note that manual changes may be necessary on Windows

parent 50bf54f9
......@@ -163,6 +163,8 @@ popd
if [ -n "$basehash" ]; then
git merge --log -s recursive "-Xsubtree=$subtree/" --no-commit "upstream-$name"
# Note: on Windows this will likely fail. Edit the script to skip the check
# and use the flag.
if git merge --help | grep -q -e allow-unrelated-histories; then
unrelated_histories_flag="--allow-unrelated-histories "
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment