Help us understand the problem. What is going on with this article?

Git | $ git rebase --interactive で 逆順に fixup / squash する

More than 3 years have passed since last update.

問題

インタラクティブモードでリベースする時の話。

たとえば、こういうコミットがある場合。

pick 77335c9 Commit A
pick d850545 Commit B

BをAに溶かしたいんじゃなくて。

Commit A
⇡
Commit B

AをBに溶かしたい。

Commit A
↓
Commit B

解決

そんな時は、まずはテキストを上下に入れ替えてから。

pick d850545 Commit B
pick 77335c9 Commit A

次に fixup ( または squash ) を指定すれば良い。

pick 77335c9 Commit A
f d850545 Commit B

環境

  • git version 2.7.4 (Apple Git-66)
Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
Comments
No comments
Sign up for free and join this conversation.
If you already have a Qiita account
Why do not you register as a user and use Qiita more conveniently?
You need to log in to use this function. Qiita can be used more conveniently after logging in.
You seem to be reading articles frequently this month. Qiita can be used more conveniently after logging in.
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
ユーザーは見つかりませんでした