Git

Search results for octopus

  1. pull-fetch-param

    /docs/pull-fetch-param

    pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote

  2. git-merge-base

    /docs/git-merge-base

    >... 'git merge-base' [-a | --all] --octopus ... 'git merge-base' --is-ancestor 'git merge-base' --independent ... 'git merge-base' --fork-point [

  3. merge-options

    /docs/merge-options

    another branch (or more in case of an octopus). + With --no-squash perform the merge and commit the result. This option can be used to override --squash. + With --squash, --commit is not allowed, and will

  4. git-show-branch

    /docs/git-show-branch

    "git reset" ! [mhf] Allow "+remote:local" refspec to cause --force when fetching. --- + [mhf] Allow "+remote:local" refspec to cause --force when fetching. + [mhf~1] Use git-octopus when pulling

  5. commit-graph-format

    /docs/commit-graph-format

    List (ID: {'E', 'D', 'G', 'E'}) [Optional] This list of 4-byte values store the second through nth parents for all octopus merges. The second parent value in the commit data stores an

  6. merge-strategies

    /docs/merge-strategies

    renames. octopus:: This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads

  7. gitformat-commit-graph

    /docs/gitformat-commit-graph

    bits. ==== Extra Edge List (ID: {'E', 'D', 'G', 'E'}) [Optional] This list of 4-byte values store the second through nth parents for all octopus merges. The second parent value in the

  8. git-merge

    /docs/git-merge

    ` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus). + With

  9. gitcore-tutorial

    /docs/gitcore-tutorial

    (this is known as 'making an Octopus'): ------------ $ git merge commit-fix diff-fix $ git show-branch ! [commit-fix] Fix commit message normalization. ! [diff-fix] Fix rename detection. * [master

  10. git-pull

    /docs/git-pull

    branch (or more in case of an octopus). + With --no-squash perform the merge and commit the result. This option can be used to override --squash. + With --squash, --commit is not allowed, and will fail

scroll-to-top