diff options
| author | Michael Forney <mforney@mforney.org> | 2016-10-31 23:28:26 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-10-31 23:45:45 -0700 |
| commit | 16c14a3ec9b0dd5f7884333cc35b6a6392079ebb (patch) | |
| tree | 1da3168ee8d71ecc82b75d89f8ebbb2814bd8eef /README.md | |
| parent | 993b66f270109391a45769ad329881699eedff42 (diff) | |
README: Add --allow-unrelated-histories to merge command
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -129,7 +129,7 @@ You may want to include a toolchain. git remote add toolchain https://github.com/michaelforney/oasis-toolchain git fetch toolchain - git merge -Xours toolchain/master + git merge -Xours --allow-unrelated-histories toolchain/master Prepare your `/etc` repository. |