linux git

git rebase

Posted by Leo on September 23, 2023

目的：git rebase

一、git pull –rebase的正确使用

使用下面的关系区别这两个操作： git pull = git fetch + git merge git pull –rebase = git fetch + git rebase

在多人使用同一个远程分支合作开发的时候，很可能出现 push 代码的时候出现以下问题：

1
2
3
4
5
6
7
8
9
10
11

$ git push origin master

# 结果如下
To github.com:hello/demo.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'git@github.com:hello/demo.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

很明显此时远程分支有新的 commit 未同步到本地，无法推送。正常情况下我们会执行以下操作：

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

$ git pull origin master

# 结果如下
remote: Counting objects: 2, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (2/2), done.
From github.com:hello/demo
   3824da0..f318a05  master     -> origin/master
Merge made by the 'recursive' strategy.
 one.md | 2 ++
 1 file changed, 2 insertions(+)
 
$ git push origin master

# 结果如下
Enumerating objects: 10, done.
Counting objects: 100% (8/8), done.
Delta compression using up to 8 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 1.24 KiB | 1.24 MiB/s, done.
Total 8 (delta 5), reused 0 (delta 0)
To github.com:hello/demo.git
   f318a05..1aefef1  master -> master

确实 push 成功了，但是此时用 git log 查看以下提交记录：

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

$ git log

# 结果如下
commit 1aefef1a2bedbd3ebd82db8dcf802011a35a9888 (HEAD -> master, origin/master, origin/HEAD)
Merge: 24cfa5c f318a05
Author: hello <hello@qq.com>
Date:   Tue Jul 23 09:53:47 2019 +0800

    Merge branch 'master' of github.com:hello/demo

commit 24cfa5c3ad271e85ff0e64793bf2bcc9d700c233
Author: hello <hello@qq.com>
Date:   Tue Jul 23 09:50:06 2019 +0800

    feat: 新功能提交

commit f318a05b1a4cbc0a6cf8d7dc7d3fb99cbafb0363
Author: world <world@qq.com>
Date:   Tue Jul 23 09:48:20 2019 +0800

    feat: 其他功能提交

...

你会发现多出了一条 merge commit，这个 commit 就是在执行 git pull origin master 的时候自动生成的。如果多人多次如此操作，那么提交记录就会出现很多条这种自从生成的 merge commit，非常难看。 要解决以上问题，不再出现自动生成的 merge commit，那么只要在执行 git pull origin master 的时候带上 –rebase 即可：

1
2
3

$ git pull --rebase origin master

$ git push origin master

注意事项

执行 git pull –rebase的时候必须保持本地目录干净。 即：不能存在状态为 modified 的文件。（存在Untracked files是没关系的） 如果出现冲突，可以选择手动解决冲突后继续rebase，也可以放弃本次rebase

执行 git pull –rebase 的时候必须保持本地目录干净 ***

  1. 有 modified 状态的文件

    本地有受版本控制的文件改动的时候，执行以上命令：

    1
2
3
4
5

     $ git pull --rebase

 # 结果如下
 error: cannot pull with rebase: You have unstaged changes.
 error: please commit or stash them.

    会出现以上报错，无法操作。

    此时查看以下文件状态：

    1
2
3
4
5
6
7
8
9
10
11
12
13
14

     $ git status

 # 结果如下
 On branch master
 Your branch is ahead of 'origin/master' by 1 commit.
 (use "git push" to publish your local commits)

 Changes not staged for commit:
 (use "git add <file>..." to update what will be committed)
 (use "git checkout -- <file>..." to discard changes in working directory)

     modified:   two.md

 no changes added to commit (use "git add" and/or "git commit -a")

    就是因为本地有文件改动尚未提交造成的。此时有两种做法：

    如果本次修改已经完成，则可以先提交（commit）一下 如果本次修改尚未完成，则可以先贮藏：git stash

    做了以上一种操作之后再尝试 git pull –rebase，不会再报错。 如果做了 git stash 操作，此时可以通过 git stash pop 回到之前的工作状态。 ***

  2. 冲突 如果出现冲突，可以选择手动解决冲突后继续 rebase，也可以放弃本次 rebase

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

$ git pull --rebase

# 结果如下
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From gitlab.lrts.me:fed/gitlab-merge
   93a1a93..960b5fc  master     -> origin/master
First, rewinding head to replay your work on top of it...
Applying: feat: 其他功能提交
Using index info to reconstruct a base tree...
M   one.md
Falling back to patching base and 3-way merge...
Auto-merging one.md
CONFLICT (content): Merge conflict in one.md
error: Failed to merge in the changes.
Patch failed at 0001 feat：其他功能提交
hint: Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

这种情况下，可以手动解决冲突，然后再执行：

1
2
3

$ git add one.md

$ git rebase --continue

解决问题。

也可以用 git rebase –abort 放弃本次 rebase 操作。

CATALOG
    FEATURED TAGS
    linux cmake git command