![]() ![]() ![]() ![]() Use applying strategies to rebase (calling git-am internally). If a temporary stash entry was created using -autostash, it will be saved to the stash list The index and working tree are also left unchanged as a result. Otherwise HEAD will be reset to where it was when the rebase operation was startedĪbort the rebase operation but HEAD is not reset back to the original branch. If was provided when the rebase operation was started, then HEAD will be reset to. Restart the rebasing process after having resolved a merge conflictĪbort the rebase operation and reset HEAD to the original branch. Although both this option and -fork-point find the merge base between and, this option uses the merge base as the starting point on which new commits will be created, whereas -fork-point uses the merge base to determine the set of commits which will be rebased While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is. This option is useful in the case where one is developing a feature on top of an upstream branch. Running git rebase -keep-base is equivalent to running git rebase -onto …. Set the starting point at which to create the new commits to the merge base of. You can leave out at most one of A and B, in which case it defaults to HEAD As a special case, you may use 'A.B' as a shortcut for the merge base of A and B if there is exactly one merge base. May be any valid commit, and not just an existing branch name. If the -onto option is not specified, the starting point is. Starting point at which to create the new commits. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |