Search results for octopus

git-merge-base
/docs/git-merge-base
'git merge-base' [-a | --all] --octopus ... 'git merge-base' --is-ancestor 'git merge-base' --independent ...
pull-fetch-param
/docs/pull-fetch-param
In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge.
git-show-branch
/docs/git-show-branch
+ [mhf~1] Use git-octopus when pulling more than one head. + [fixes] Introduce "reset type" flag to "git reset" + [mhf~2] "git fetch --force".
merge-options
/docs/merge-options
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 the merge and commit
git-merge
/docs/git-merge
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 the merge and commit
git-pull
/docs/git-pull
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 the merge and commit
merge-strategies
/docs/merge-strategies
octopus:: This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution.
gitcore-tutorial
/docs/gitcore-tutorial
Then, instead of running two 'git merge' commands in a row, you would merge these two branch heads (this is known as 'making an Octopus'): ------------ $ git merge commit-fix diff-fix $ git show-branch
gitformat-commit-graph
/docs/gitformat-commit-graph
. ==== 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.
gitpacking
/docs/gitpacking
An identical bitmap would be generated for an octopus merge with the same set of parents as described in the commits bitmap.