0

More than 3 years have passed since last update.

@pham-anh(Anh Pham)in

株式会社エクストランス

git rebaseの例

Git

Last updated at 2020-09-13Posted at 2020-09-13

Assumption

Sample branches' status

            /--- commit1--- commit2     `feature-1`
           /
*----*----*    `develop`
           \
            \--- commitA --- commitB    `feature-A`

Changes in branch feature-1 and feature-A have no conflicts

Do a rebase

Case 1: On branch `feature-A`, rebase branch `feature-1`

$ git checkout feature-A

$ git rebase feature-1

First, rewinding head to replay your work on top of it...

Applying: commitA

Applying: commitB

Then the commit history will look like this:

                                     /--- commitA --- commitB   `feature-A `
                                    /
            /--- commit1--- commit2   `feature-1`
           /
*----*----*   `develop`

Case 2: On branch `feature-1`, rebase branch `feature-A`

$ git checkout feature-1

$ git rebase feature-A

First, rewinding head to replay your work on top of it...

Applying: commit1

Applying: commit2

Then the commit history will look like this:

                                     /--- commit1 --- commit2   `feature-1 `
                                    /
            /--- commitA--- commitB   `feature-A`
           /
*----*----*   `develop`

0

Register as a new user and use Qiita more conveniently

You get articles that match your needs
You can efficiently read back useful information
You can use dark theme

What you can do with signing up

0