Skip to content

Commit

Permalink
UPDATER: allow-unrelated-histories on pull (GIT) (#756)
Browse files Browse the repository at this point in the history
Signed-off-by: grm34 <[email protected]>

Signed-off-by: grm34 <[email protected]>
  • Loading branch information
grm34 authored Nov 11, 2022
1 parent c88c04f commit 5ddfb58
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/zmb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@ _update_git() {
fi
fi
_command git config pull.rebase true
_command unbuffer git pull --depth=1
_command unbuffer git pull --depth=1 --allow-unrelated-histories
[[ $1 == "$ZMB_BRANCH" ]] &&
sudo cp -f "${HOME}/ZenMaxBuilder/src/zmb.sh" \
"${PREFIX/\/usr}/usr/bin/zmb"
Expand Down

0 comments on commit 5ddfb58

Please sign in to comment.