{"thread":{"id":"27189","subject":"[BUG] git pull does not understand --strategy-option","startedAt":"2011-04-26T14:06:36Z","lastAt":"2011-04-27T18:27:57Z","messageCount":2,"participants":["David Deller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"166381","messageId":"BANLkTinFcob1RrOxEDDG+B6UAZGYg-smtg@mail.gmail.com","threadId":"27189","inReplyTo":null,"subject":"[BUG] git pull does not understand --strategy-option","fromName":"David Deller","fromEmail":"david@horizon-nigh.org","sentAt":"2011-04-26T14:06:36Z","receivedAt":"2011-04-26T14:06:36Z","isPatch":false,"sender":{"key":"david@horizon-nigh.org","avatar":null},"body":"Works using short form (-X). Works with 'git merge' using either short\nor long form.\n\nApologies, I do not have the current version of Git, but I did not see\nany mention of a related fix in changelogs.\n\n$ git --version\ngit version 1.7.4.1\n\n$ git pull --strategy=recursive --strategy-option=theirs origin master\nerror: unknown option `strategy-option=theirs'\nusage: git fetch [<options>] [<repository> [<refspec>...]]\n   or: git fetch [<options>] <group>\n   or: git fetch --multiple [<options>] [(<repository> | <group>)...]\n   or: git fetch --all [<options>]\n\n    -v, --verbose         be more verbose\n    -q, --quiet           be more quiet\n    --all                 fetch from all remotes\n    -a, --append          append to .git/FETCH_HEAD instead of overwriting\n    --upload-pack <PATH>  path to upload pack on remote end\n    -f, --force           force overwrite of local branch\n    -m, --multiple        fetch from multiple remotes\n    -t, --tags            fetch all tags and associated objects\n    -n                    do not fetch all tags (--no-tags)\n    -p, --prune           prune remote-tracking branches no longer on remote\n    --recurse-submodules  control recursive fetching of submodules\n    --dry-run             dry run\n    -k, --keep            keep downloaded pack\n    -u, --update-head-ok  allow updating of HEAD ref\n    --progress            force progress reporting\n    --depth <DEPTH>       deepen history of shallow clone\n\n$ git pull --strategy=recursive -X theirs origin master\nFrom ssh://git.internal/repos.git\n * branch            master     -> FETCH_HEAD\nAlready up-to-date.\n\n\nDavid\n"},{"id":"166539","messageId":"BANLkTiniVvLe7Wb9-OsKNb8nY23jxo-vQw@mail.gmail.com","threadId":"27189","inReplyTo":"BANLkTinFcob1RrOxEDDG+B6UAZGYg-smtg@mail.gmail.com","subject":"Re: [BUG] git pull does not understand --strategy-option","fromName":"David Deller","fromEmail":"david@horizon-nigh.org","sentAt":"2011-04-27T18:27:57Z","receivedAt":"2011-04-27T18:27:57Z","isPatch":false,"sender":{"key":"david@horizon-nigh.org","avatar":null},"body":"> $ git pull --strategy=recursive --strategy-option=theirs origin master\n> error: unknown option `strategy-option=theirs'\n> usage: git fetch [<options>] [<repository> [<refspec>...]]\n\nI was able to confirm that the bug still exists in the latest version\nof Git, 1.7.5. The docs say the option should work.\n\nThis affects Phing's[1] Git Pull task[2], which always outputs the\nlong form whenever the corresponding option is used.\n\nDavid\n\n[1] PHP build tool\n[2] http://www.phing.info/docs/guide/stable/chapters/appendixes/AppendixC-OptionalTasks.html#GitPullTask\n"}]}