[BUG] git pull does not understand --strategy-option
- From
- David Deller <david@horizon-nigh.org>
- Date
- Apr 26, 2011, 14:06 UTC
- Message-ID
- <BANLkTinFcob1RrOxEDDG+B6UAZGYg-smtg@mail.gmail.com>
Works using short form (-X). Works with 'git merge' using either short or long form.
Apologies, I do not have the current version of Git, but I did not see any mention of a related fix in changelogs.
$ git --version git version 1.7.4.1
$ git pull --strategy=recursive --strategy-option=theirs origin master error: unknown option `strategy-option=theirs' usage: git fetch [<options>] [<repository> [<refspec>...]] or: git fetch [<options>] <group> or: git fetch --multiple [<options>] [(<repository> | <group>)...] or: git fetch --all [<options>]
-v, --verbose be more verbose
-q, --quiet be more quiet
--all fetch from all remotes
-a, --append append to .git/FETCH_HEAD instead of overwriting
--upload-pack <PATH> path to upload pack on remote end
-f, --force force overwrite of local branch
-m, --multiple fetch from multiple remotes
-t, --tags fetch all tags and associated objects
-n do not fetch all tags (--no-tags)
-p, --prune prune remote-tracking branches no longer on remote
--recurse-submodules control recursive fetching of submodules
--dry-run dry run
-k, --keep keep downloaded pack
-u, --update-head-ok allow updating of HEAD ref
--progress force progress reporting
--depth <DEPTH> deepen history of shallow clone$ git pull --strategy=recursive -X theirs origin master From ssh://git.internal/repos.git * branch master -> FETCH_HEAD Already up-to-date.
David