Git

Search results for octopus

  1. git-show-branch

    /docs/git-show-branch

    -octopus when pulling more than one heads. + [fixes] Introduce "reset type" flag to "git reset" + [mhf~2] "git fetch --force". + [mhf~3] Use .git/remote/origin, not .git/branches/origin. + [mhf~4

  2. 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

  3. git-merge-base

    /docs/git-merge-base

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

  4. 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

  5. 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

  6. 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

  7. git-merge

    /docs/git-merge

    top of the current branch whose effect is the same as merging 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

  8. 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

  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-rebase

    /docs/git-rebase

    merge algorithm. It tries to carefully detect criss-cross merge ambiguities. It does not handle renames. octopus:: This resolves cases with more than two heads, but refuses to do a complex merge

scroll-to-top