Git

Search results for octopus

  1. merge-options

    /docs/merge-options

    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 --no-squash perform the merge and commit the result

  2. pull-fetch-param

    /docs/pull-fetch-param

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

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

  5. merge-strategies

    /docs/merge-strategies

    , the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match. octopus:: This resolves cases with more than two heads, but refuses to do a complex merge

  6. commit-graph-format

    /docs/commit-graph-format

    store the second through nth parents for all octopus merges. The second parent value in the commit data stores an array position within this list along with the most-significant bit

  7. git-merge

    /docs/git-merge

    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 --no-squash perform

  8. git-pull

    /docs/git-pull

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

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

    /docs/git-fetch

    fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git