mirror of
https://github.com/k88hudson/git-flight-rules.git
synced 2025-03-10 12:48:43 -03:00
Add rebase --onto details (#231)
This commit is contained in:
parent
f8257b615b
commit
c767e4b22a
11
README.md
11
README.md
@ -76,6 +76,7 @@ All commands should work for at least git version 2.13.0. See the [git website](
|
||||
- [I need to merge a branch into a single commit](#i-need-to-merge-a-branch-into-a-single-commit)
|
||||
- [I want to combine only unpushed commits](#i-want-to-combine-only-unpushed-commits)
|
||||
- [I need to abort the merge](#i-need-to-abort-the-merge)
|
||||
- [I need to update the parent commit of my branch](#i-need-to-update-the-parent-commit-of-my-branch)
|
||||
- [Check if all commits on a branch are merged](#check-if-all-commits-on-a-branch-are-merged)
|
||||
- [Possible issues with interactive rebases](#possible-issues-with-interactive-rebases)
|
||||
- [The rebase editing screen says 'noop'](#the-rebase-editing-screen-says-noop)
|
||||
@ -1047,6 +1048,16 @@ Sometimes the merge can produce problems in certain files, in those cases we can
|
||||
|
||||
This command is available since Git version >= 1.7.4
|
||||
|
||||
### I need to update the parent commit of my branch
|
||||
|
||||
Say I have a master branch, a feature-1 branch branched from master, and a feature-2 branch branched off of feature-1. If I make a commit to feature-1, then the parent commit of feature-2 is no longer accurate (it should be the head of feature-1, since we branched off of it). We can fix this with `git rebase --onto`.
|
||||
|
||||
```sh
|
||||
(feature-2)$ git rebase --onto feature-1 <the first commit in your feature-2 branch that you don't want to bring along> feature-2
|
||||
```
|
||||
|
||||
This helps in sticky scenarios where you might have a feature built on another feature that hasn't been merged yet, and a bugfix on the feature-1 branch needs to be reflected in your feature-2 branch.
|
||||
|
||||
### Check if all commits on a branch are merged
|
||||
|
||||
To check if all commits on a branch are merged into another branch, you should diff between the heads (or any commits) of those branches:
|
||||
|
Loading…
x
Reference in New Issue
Block a user