Not implemented Create a new branch named and start it at ; see linkgit:git-branch[1] for details.

Not implemented The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictstyle configuration variable. Possible values are "merge" (default) and "diff3" (in addition to what is shown by "merge" style, shows the original contents).

Not implemented When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes. + When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are ignored.

Not implemented Create the new branch's reflog; see linkgit:git-branch[1] for details.

Not implemented When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch. + When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path). + When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths.

Not implemented Do not set up "upstream" configuration, even if the branch.autosetupmerge configuration variable is true.

Not implemented When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths.

Not implemented Interactively select hunks in the difference between the (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a was specified, the index). + This means that you can use `git checkout -p` to selectively discard edits from your current working tree.

Not implemented Quiet, suppress feedback messages.

Not implemented When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths.

Not implemented When creating a new branch, set up "upstream" configuration. See "--track" in linkgit:git-branch[1] for details. + If no '-b' option is given, the name of the new branch will be derived from the remote branch. If "remotes/" or "refs/remotes/" is prefixed it is stripped away, and then the part up to the next slash (which would be the nickname of the remote) is removed. This would tell us to use "hack" as the local branch when branching off of "origin/hack" (or "remotes/origin/hack", or even "refs/remotes/origin/hack"). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with '-b' in such a case.