Git – rebase -i～コミットの統合

2021-08-14 / tau / コメントする

概要

git rebaseは今いるブランチのベースを変更するが、-i (intaractive)オプションを付けることで、複数コミットを統合することができる。

interactiveという通り、その過程で何度かエディターが起動して操作内容が表示され、コミット統合に必要な内容に書き換えていく。

準備

以下のように、sample.txtに1行ずつ追加するコミットを含むリポジトリーを準備する。

[vagrant@localhost example]$ git log -p
commit 0d042cb782946614fe5457dfe0f86f127d763fe9 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 15:20:18 2021 +0900

    main-3

diff --git a/sample.txt b/sample.txt
index 6f3e91e..9812172 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1,2 +1,3 @@
 main-1で新規作成
 main-2で2行目追加
+main-3で3行目追加

commit 454e22d8a0ec0330811686801e9bb04a1c5eb391
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 15:19:39 2021 +0900

    main-2

diff --git a/sample.txt b/sample.txt
index f704a42..6f3e91e 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1 +1,2 @@
 main-1で新規作成
+main-2で2行目追加

commit f9dd6a932cbd4017c151c2d5b7bfaeb596b95193
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 15:19:08 2021 +0900

    main-1

diff --git a/sample.txt b/sample.txt
new file mode 100644
index 0000000..f704a42
--- /dev/null
+++ b/sample.txt
@@ -0,0 +1 @@
+main-1で新規作成

commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sat Aug 14 11:43:19 2021 +0900

    Initial commit

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c6fba08
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# example
\ No newline at end of file

[vagrant@localhost example]$ git log -p

commit 0d042cb782946614fe5457dfe0f86f127d763fe9 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 15:20:18 2021 +0900

main-3

diff --git a/sample.txt b/sample.txt

index 6f3e91e..9812172 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1,2 +1,3 @@

main-1で新規作成

main-2で2行目追加

+main-3で3行目追加

commit 454e22d8a0ec0330811686801e9bb04a1c5eb391

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 15:19:39 2021 +0900

main-2

diff --git a/sample.txt b/sample.txt

index f704a42..6f3e91e 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1 +1,2 @@

main-1で新規作成

+main-2で2行目追加

commit f9dd6a932cbd4017c151c2d5b7bfaeb596b95193

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 15:19:08 2021 +0900

main-1

diff --git a/sample.txt b/sample.txt

new file mode 100644

index 0000000..f704a42

--- /dev/null

+++ b/sample.txt

@@ -0,0 +1 @@

+main-1で新規作成

commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 11:43:19 2021 +0900

Initial commit

diff --git a/README.md b/README.md

new file mode 100644

index 0000000..c6fba08

--- /dev/null

+++ b/README.md

@@ -0,0 +1 @@

+# example

\ No newline at end of file

2つのコミットの統合

rebaseコマンド

main-2とmain-3のコミットを統合するため、その直前＝main-1のコミット直後を指定してrebaseする。このとき-iオプションを付けることで、リベースの過程での操作を指定できる。

[vagrant@localhost example]$ git rebase -i f9dd6a9

1	[vagrant@localhost example]$ git rebase -i f9dd6a9

各コミットへの対応記述

rebaseを実行するとエディターが起動して以下のように表示される。

この段階では、ベースとなるmain-1より後のmain-2とmain-3の2つのコミットについて、そのまま適用されることになる
つまり、main-1コミットの後にmain-2とmain-3がそのまま連なることになり、何も変わらない
これを、main-2とmain-3をまとめた上でmain-1の後に来るようにしたい

pick 454e22d main-2
pick 0d042cb main-3

# Rebase f9dd6a9..0d042cb onto f9dd6a9 (2 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# .       create a merge commit using the original merge commit's
# .       message (or the oneline, if no original merge commit was
# .       specified). Use -c <commit> to reword the commit message.
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out
~
~
~
.....

pick 454e22d main-2

pick 0d042cb main-3

# Rebase f9dd6a9..0d042cb onto f9dd6a9 (2 commands)

# Commands:

# p, pick <commit> = use commit

# r, reword <commit> = use commit, but edit the commit message

# e, edit <commit> = use commit, but stop for amending

# s, squash <commit> = use commit, but meld into previous commit

# f, fixup <commit> = like "squash", but discard this commit's log message

# x, exec <command> = run command (the rest of the line) using shell

# b, break = stop here (continue rebase later with 'git rebase --continue')

# d, drop <commit> = remove commit

# l, label <label> = label current HEAD with a name

# t, reset <label> = reset HEAD to a label

# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]

# . create a merge commit using the original merge commit's

# . message (or the oneline, if no original merge commit was

# . specified). Use -c <commit> to reword the commit message.

# These lines can be re-ordered; they are executed from top to bottom.

# If you remove a line here THAT COMMIT WILL BE LOST.

# However, if you remove everything, the rebase will be aborted.

# Note that empty commits are commented out

.....

Commands:のところを見ると、以下のように読める。

p, pickはそのコミットをそのまま使う
s, squashはそのコミットを使うが、1つ前のコミットに統合(融合?)させる

そこで、後の方のコミットmain-3をpickからsquashに変更する。こうすれば、main-2コミットはそのまま使われ、そこにmain-3コミットも統合されるはず。

pick 454e22d main-2
squash 0d042cb main-3

# Rebase f9dd6a9..0d042cb onto f9dd6a9 (2 commands)
.....

pick 454e22d main-2

squash 0d042cb main-3

# Rebase f9dd6a9..0d042cb onto f9dd6a9 (2 commands)

.....

コミットメッセージの編集

上記の内容で保存・終了すると、さらにエディターが起動して以下のように表示される。

# This is a combination of 2 commits.
# This is the 1st commit message:

main-2

# This is the commit message #2:

main-3

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Sat Aug 14 15:19:39 2021 +0900
#
# interactive rebase in progress; onto f9dd6a9
# Last commands done (2 commands done):
#    pick 454e22d main-2
#    squash 0d042cb main-3
# No commands remaining.
# You are currently rebasing branch 'main' on 'f9dd6a9'.
#
# Changes to be committed:
#       modified:   sample.txt
#
~
~
~
.....

# This is a combination of 2 commits.

# This is the 1st commit message:

main-2

# This is the commit message #2:

main-3

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

# Date: Sat Aug 14 15:19:39 2021 +0900

# interactive rebase in progress; onto f9dd6a9

# Last commands done (2 commands done):

# pick 454e22d main-2

# squash 0d042cb main-3

# No commands remaining.

# You are currently rebasing branch 'main' on 'f9dd6a9'.

# Changes to be committed:

# modified: sample.txt

.....

2つのコミットを1つにするので、コミットメッセージを1つだけにして、終了の空行を入れる。

main-2 and 3 gathered

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
.....

main-2 and 3 gathered

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

.....

処理結果

上記の内容を保存・終了すると、rebaseの処理内容が以下のように表示される。

[vagrant@localhost example]$ git rebase -i f9dd6a9
[detached HEAD 7a2abb7] main-2 and 3 gathered
 Date: Sat Aug 14 15:19:39 2021 +0900
 1 file changed, 2 insertions(+)
Successfully rebased and updated refs/heads/main.

[vagrant@localhost example]$ git rebase -i f9dd6a9

[detached HEAD 7a2abb7] main-2 and 3 gathered

Date: Sat Aug 14 15:19:39 2021 +0900

1 file changed, 2 insertions(+)

Successfully rebased and updated refs/heads/main.

ログで確認すると、main-2とmain-3が1つにまとめられ、指定したコミットメッセージになっている。

[vagrant@localhost example]$ git log
commit 7a2abb787d1fa93e8c8ccaec08e6b3fdff5e4a23 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 15:19:39 2021 +0900

    main-2 and 3 gathered

commit f9dd6a932cbd4017c151c2d5b7bfaeb596b95193
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 15:19:08 2021 +0900

    main-1

commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sat Aug 14 11:43:19 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 7a2abb787d1fa93e8c8ccaec08e6b3fdff5e4a23 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 15:19:39 2021 +0900

main-2 and 3 gathered

commit f9dd6a932cbd4017c151c2d5b7bfaeb596b95193

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 15:19:08 2021 +0900

main-1

commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 11:43:19 2021 +0900

Initial commit

コミットをまとめただけなので、sample.txtの内容は変化しない。

[vagrant@localhost example]$ cat sample.txt
main-1で新規作成
main-2で2行目追加
main-3で3行目追加

[vagrant@localhost example]$ cat sample.txt

main-1で新規作成

main-2で2行目追加

main-3で3行目追加

3つ以上のコミットの統合

main-1～3の3つの連続するコミットをまとめるため、その直前のコミットを指定してrebase。

[vagrant@localhost example]$ git rebase -i origin/main

1	[vagrant@localhost example]$ git rebase -i origin/main

エディターが起動。

pick f9dd6a9 main-1
pick 454e22d main-2
pick 0d042cb main-3

# Rebase 7fe38cd..0d042cb onto 7fe38cd (3 commands)
.....

pick f9dd6a9 main-1

pick 454e22d main-2

pick 0d042cb main-3

# Rebase 7fe38cd..0d042cb onto 7fe38cd (3 commands)

.....

以下のようにpick→squashに変更して保存。これにより、main-2はmain-1に統合され、そこにmain-3も統合される。

pick f9dd6a9 main-1
squash 454e22d main-2
squash 0d042cb main-3

# Rebase 7fe38cd..0d042cb onto 7fe38cd (3 commands)
.....

pick f9dd6a9 main-1

squash 454e22d main-2

squash 0d042cb main-3

# Rebase 7fe38cd..0d042cb onto 7fe38cd (3 commands)

.....

再度エディターが起動。

# This is a combination of 3 commits.
# This is the 1st commit message:

main-1

# This is the commit message #2:

main-2

# This is the commit message #3:

main-3

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
.....

# This is a combination of 3 commits.

# This is the 1st commit message:

main-1

# This is the commit message #2:

main-2

# This is the commit message #3:

main-3

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

.....

統合後のコミットメッセージを編集して保存・終了。

main-1 to 3 commits gathered

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
.....

main-1 to 3 commits gathered

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

.....

実行結果。

[vagrant@localhost example]$ git rebase -i origin/main
[detached HEAD e62e8e2] main-1 to 3 commits gathered
 Date: Sat Aug 14 15:19:08 2021 +0900
 1 file changed, 3 insertions(+)
 create mode 100644 sample.txt
Successfully rebased and updated refs/heads/main.

[vagrant@localhost example]$ git rebase -i origin/main

[detached HEAD e62e8e2] main-1 to 3 commits gathered

Date: Sat Aug 14 15:19:08 2021 +0900

1 file changed, 3 insertions(+)

create mode 100644 sample.txt

Successfully rebased and updated refs/heads/main.

3つのコミットが1つにまとめられた。

[vagrant@localhost example]$ git log
commit e62e8e2753af9aec3c6b48554a6d71ed2508261f (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 15:19:08 2021 +0900

    main-1 to 3 commits gathered

commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sat Aug 14 11:43:19 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit e62e8e2753af9aec3c6b48554a6d71ed2508261f (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 15:19:08 2021 +0900

main-1 to 3 commits gathered

commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 11:43:19 2021 +0900

Initial commit

イニシャルコミットとの統合

一番最初のコミットと統合するには、以下のコマンドを使う。

git rabase -i --root

以下の例では、README.mdを修正した2つ目のコミットを1つ目のInitial commitに統合している。

[vagrant@localhost codecamp]$ git log
commit 735a9faec64339055621b415c698f4eb7fdf02eb (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Sun Aug 15 22:18:55 2021 +0900

    README.md modified

commit 73c1bc8e633b3aa9299549c25ea618fc8d2466f3 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 15 20:27:10 2021 +0900

    Initial commit
[vagrant@localhost codecamp]$ git rebase -i --root
[detached HEAD f642840] Initial commit
 Author: taustation <88479749+taustation@users.noreply.github.com>
 Date: Sun Aug 15 20:27:10 2021 +0900
 1 file changed, 1 insertion(+)
 create mode 100644 README.md
Successfully rebased and updated refs/heads/main.
[vagrant@localhost codecamp]$ git log
commit f6428405e52dffed607fda510ae22aa10fa137cd (HEAD -> main)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 15 20:27:10 2021 +0900

    Initial commit

[vagrant@localhost codecamp]$ git log

commit 735a9faec64339055621b415c698f4eb7fdf02eb (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Sun Aug 15 22:18:55 2021 +0900

README.md modified

commit 73c1bc8e633b3aa9299549c25ea618fc8d2466f3 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 15 20:27:10 2021 +0900

Initial commit

[vagrant@localhost codecamp]$ git rebase -i --root

[detached HEAD f642840] Initial commit

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 15 20:27:10 2021 +0900

1 file changed, 1 insertion(+)

create mode 100644 README.md

Successfully rebased and updated refs/heads/main.

[vagrant@localhost codecamp]$ git log

commit f6428405e52dffed607fda510ae22aa10fa137cd (HEAD -> main)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 15 20:27:10 2021 +0900

Initial commit

リモートへの反映

リモートからpullしたリポジトリーの場合、そのままではpushできない。

ローカルでのrebaseの結果をリモートにそのまま反映するには、push -fで強制的に上書きする。

ただし他のローカルでその内容を反映させるには、改めてcloneする必要がある。

Git – マージ – squash～ブランチをまとめて取り込む

2021-08-14 / tau / コメントする

概要

git mergeで--squashオプションを付けると、指定したブランチの全コミットを1つにまとめて今のブランチに追加する。

準備

以下のようなリポジトリーを使う。

mainブランチのコミットでREADME.txtに新規書き込み
topicブランチの2つのコミットでREADME.txtに新規書き込みと1行追加

[vagrant@localhost example]$ git log --all --graph -p
* commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a (topic)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 11:58:57 2021 +0900
|
|     topic-2
|
| diff --git a/README.md b/README.md
| index 61e0c69..6bf2b17 100644
| --- a/README.md
| +++ b/README.md
| @@ -1 +1,2 @@
|  topicブランチで新規書き込み
| +topicブランチで1行追加
|
* commit 81b58182e88d1bb6de3f5c072c23346443e8f473
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 11:57:44 2021 +0900
|
|     topic-1
|
| diff --git a/README.md b/README.md
| index c6fba08..61e0c69 100644
| --- a/README.md
| +++ b/README.md
| @@ -1 +1 @@
| -# example
| \ No newline at end of file
| +topicブランチで新規書き込み
|
| * commit d181ff88ca5d18c2aa2795fee0a8596cb8a3e533 (HEAD -> main)
|/  Author: taustation <taustation@gmail.com>
|   Date:   Sat Aug 14 11:56:15 2021 +0900
|
|       main-1
|
|   diff --git a/README.md b/README.md
|   index c6fba08..c133df9 100644
|   --- a/README.md
|   +++ b/README.md
|   @@ -1 +1 @@
|   -# example
|   \ No newline at end of file
|   +mainブランチで新規書き込み
|
* commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Sat Aug 14 11:43:19 2021 +0900

      Initial commit

  diff --git a/README.md b/README.md
  new file mode 100644
  index 0000000..c6fba08
  --- /dev/null
  +++ b/README.md
  @@ -0,0 +1 @@
  +# example
  \ No newline at end of file

[vagrant@localhost example]$ git log --all --graph -p

* commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a (topic)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:58:57 2021 +0900

| topic-2

| diff --git a/README.md b/README.md

| index 61e0c69..6bf2b17 100644

| --- a/README.md

| +++ b/README.md

| @@ -1 +1,2 @@

| topicブランチで新規書き込み

| +topicブランチで1行追加

* commit 81b58182e88d1bb6de3f5c072c23346443e8f473

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:57:44 2021 +0900

| topic-1

| diff --git a/README.md b/README.md

| index c6fba08..61e0c69 100644

| --- a/README.md

| +++ b/README.md

| @@ -1 +1 @@

| -# example

| \ No newline at end of file

| +topicブランチで新規書き込み

| * commit d181ff88ca5d18c2aa2795fee0a8596cb8a3e533 (HEAD -> main)

|/ Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:56:15 2021 +0900

| main-1

| diff --git a/README.md b/README.md

| index c6fba08..c133df9 100644

| --- a/README.md

| +++ b/README.md

| @@ -1 +1 @@

| -# example

| \ No newline at end of file

| +mainブランチで新規書き込み

* commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 11:43:19 2021 +0900

Initial commit

diff --git a/README.md b/README.md

new file mode 100644

index 0000000..c6fba08

--- /dev/null

+++ b/README.md

@@ -0,0 +1 @@

+# example

\ No newline at end of file

マージ

mainブランチで、--suquashオプションを指定してgit mergeでtopicブランチをマージ。今回は同じREADME.txtを編集しているので競合が発生している。

[vagrant@localhost example]$ git branch
* main
  topic
[vagrant@localhost example]$ git merge --squash topic
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.

[vagrant@localhost example]$ git branch

* main

topic

[vagrant@localhost example]$ git merge --squash topic

Auto-merging README.md

CONFLICT (content): Merge conflict in README.md

Squash commit -- not updating HEAD

Automatic merge failed; fix conflicts and then commit the result.

README.txtの競合状態を確認。

[vagrant@localhost example]$ cat README.md
<<<<<<< HEAD
mainブランチで新規書き込み
=======
topicブランチで新規書き込み
topicブランチで1行追加
>>>>>>> topic

[vagrant@localhost example]$ cat README.md

<<<<<<< HEAD

mainブランチで新規書き込み

=======

topicブランチで新規書き込み

topicブランチで1行追加

>>>>>>> topic

README.txtを編集して競合を解消。

[vagrant@localhost example]$ vi README.md
[vagrant@localhost example]$ cat README.md
mainブランチで新規書き込み
topicブランチで新規書き込み
topicブランチで1行追加

[vagrant@localhost example]$ vi README.md

[vagrant@localhost example]$ cat README.md

mainブランチで新規書き込み

topicブランチで新規書き込み

topicブランチで1行追加

結果をadd、コミット。

[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit
[main 3ba8418] Squashed commit of the following:
 1 file changed, 2 insertions(+)
[vagrant@localhost example]$ [main 3ba8418] Squashed commit of the following:
 1 file changed, 2 insertions(+)

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit

[main 3ba8418] Squashed commit of the following:

1 file changed, 2 insertions(+)

[vagrant@localhost example]$ [main 3ba8418] Squashed commit of the following:

1 file changed, 2 insertions(+)

no-fast-forwardマージとしてエディターが起動。内容を確認して保存・終了。

Squashed commit of the following:

commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 11:58:57 2021 +0900

    topic-2

commit 81b58182e88d1bb6de3f5c072c23346443e8f473
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 11:57:44 2021 +0900

    topic-1

# Conflicts:
#       README.md

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch main
# Your branch is ahead of 'origin/main' by 1 commit.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#       modified:   README.md
#
~
~
~
.....

Squashed commit of the following:

commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 11:58:57 2021 +0900

topic-2

commit 81b58182e88d1bb6de3f5c072c23346443e8f473

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 11:57:44 2021 +0900

topic-1

# Conflicts:

# README.md

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

# On branch main

# Your branch is ahead of 'origin/main' by 1 commit.

# (use "git push" to publish your local commits)

# Changes to be committed:

# modified: README.md

.....

コミット結果が表示される。

[vagrant@localhost example]$ git commit
[main 3ba8418] Squashed commit of the following:
 1 file changed, 2 insertions(+)
[vagrant@localhost example]$ [main 3ba8418] Squashed commit of the following:
 1 file changed, 2 insertions(+)

[vagrant@localhost example]$ git commit

[main 3ba8418] Squashed commit of the following:

1 file changed, 2 insertions(+)

[vagrant@localhost example]$ [main 3ba8418] Squashed commit of the following:

1 file changed, 2 insertions(+)

ログで確認。topicブランチでの2つのコミットが1つのsquashed commitとしてつなげられた。

[vagrant@localhost example]$ git log --all --graph
* commit 3ba84184f84e24a5d4caffa2b028efcbb6b30850 (HEAD -> main)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 13:36:47 2021 +0900
|
|     Squashed commit of the following:
|
|     commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a
|     Author: taustation <taustation@gmail.com>
|     Date:   Sat Aug 14 11:58:57 2021 +0900
|
|         topic-2
|
|     commit 81b58182e88d1bb6de3f5c072c23346443e8f473
|     Author: taustation <taustation@gmail.com>
|     Date:   Sat Aug 14 11:57:44 2021 +0900
|
|         topic-1
|
* commit d181ff88ca5d18c2aa2795fee0a8596cb8a3e533
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 11:56:15 2021 +0900
|
|     main-1
|
| * commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a (topic)
| | Author: taustation <taustation@gmail.com>
| | Date:   Sat Aug 14 11:58:57 2021 +0900
| |
| |     topic-2
| |
| * commit 81b58182e88d1bb6de3f5c072c23346443e8f473
|/  Author: taustation <taustation@gmail.com>
|   Date:   Sat Aug 14 11:57:44 2021 +0900
|
|       topic-1
|
* commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Sat Aug 14 11:43:19 2021 +0900

      Initial commit

[vagrant@localhost example]$ git log --all --graph

* commit 3ba84184f84e24a5d4caffa2b028efcbb6b30850 (HEAD -> main)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 13:36:47 2021 +0900

| Squashed commit of the following:

| commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:58:57 2021 +0900

| topic-2

| commit 81b58182e88d1bb6de3f5c072c23346443e8f473

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:57:44 2021 +0900

| topic-1

* commit d181ff88ca5d18c2aa2795fee0a8596cb8a3e533

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:56:15 2021 +0900

| main-1

| * commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a (topic)

| | Author: taustation <taustation@gmail.com>

| | Date: Sat Aug 14 11:58:57 2021 +0900

| |

| | topic-2

| |

| * commit 81b58182e88d1bb6de3f5c072c23346443e8f473

|/ Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:57:44 2021 +0900

| topic-1

* commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 11:43:19 2021 +0900

Initial commit

マージの取り消し

git reset --hard ORIG_HEADでマージ前に戻ることができる。

[vagrant@localhost example]$ git reset --hard ORIG_HEAD

1	[vagrant@localhost example]$ git reset --hard ORIG_HEAD

ログも元に戻る。

[vagrant@localhost example]$ git log --all --graph
* commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a (topic)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 11:58:57 2021 +0900
|
|     topic-2
|
* commit 81b58182e88d1bb6de3f5c072c23346443e8f473
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 11:57:44 2021 +0900
|
|     topic-1
|
| * commit d181ff88ca5d18c2aa2795fee0a8596cb8a3e533 (HEAD -> main)
|/  Author: taustation <taustation@gmail.com>
|   Date:   Sat Aug 14 11:56:15 2021 +0900
|
|       main-1
|
* commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Sat Aug 14 11:43:19 2021 +0900

      Initial commit

[vagrant@localhost example]$ git log --all --graph

* commit 4a650fbf10788e751ec4adafbcc262e6fafbd91a (topic)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:58:57 2021 +0900

| topic-2

* commit 81b58182e88d1bb6de3f5c072c23346443e8f473

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:57:44 2021 +0900

| topic-1

| * commit d181ff88ca5d18c2aa2795fee0a8596cb8a3e533 (HEAD -> main)

|/ Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:56:15 2021 +0900

| main-1

* commit 7fe38cd822113861b9e2062902fea7881f10de45 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 11:43:19 2021 +0900

Initial commit

Git – cherry-pic – コミットを取り込む

2021-08-14 / tau / コメントする

概要

git cherry-pickは他のブランチのコミットの一部を今のブランチに取り込む
1つないし複数のコミットを指定可能
結果は自動的にコミットされるが、-nオプションでステージングのレベルに留めることができる

英語の”cherry pick”はサクランボ狩りのことで、いいサクランボを選んで摘むことから、次のような使われ方をするようだ。

自分の気に入ったものだけを選ぶ
選り好みする
品物や人材を厳選する
目玉商品を探し漁る
都合のいいデータ・証拠だけを選んで偽装する

準備

次のような内容のローカルリポジトリーを使う。それぞれのコミットで、対応するファイルが作成される。

[vagrant@localhost example]$ git log --all --graph
* commit 39851204a64b3392dd83f21147fc57ba5267f6fa (HEAD -> main)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 10:47:01 2021 +0900
|
|     main1
|
| * commit d23428407b485123afa26306f95ba9a8ba9df742 (topic)
| | Author: taustation <taustation@gmail.com>
| | Date:   Sat Aug 14 10:44:40 2021 +0900
| |
| |     topic2
| |
| * commit 675bca2ec610a3552f44bd83673c32f47a5ab041
|/  Author: taustation <taustation@gmail.com>
|   Date:   Sat Aug 14 10:43:45 2021 +0900
|
|       topic1
|
* commit 8567dd9242b60bdf96ddd7a57f0434f087fe706d (origin/main, origin/HEAD)
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Sat Aug 14 10:27:48 2021 +0900

      Initial commit

[vagrant@localhost example]$ git log --all --graph

* commit 39851204a64b3392dd83f21147fc57ba5267f6fa (HEAD -> main)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:47:01 2021 +0900

| main1

| * commit d23428407b485123afa26306f95ba9a8ba9df742 (topic)

| | Author: taustation <taustation@gmail.com>

| | Date: Sat Aug 14 10:44:40 2021 +0900

| |

| | topic2

| |

| * commit 675bca2ec610a3552f44bd83673c32f47a5ab041

|/ Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:43:45 2021 +0900

| topic1

* commit 8567dd9242b60bdf96ddd7a57f0434f087fe706d (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 10:27:48 2021 +0900

Initial commit

cherry-pick実行

mainブランチに、topicブランチのtopic1コミットだけを取り込みたいとする。

[vagrant@localhost example]$ git branch
* main
  topic

[vagrant@localhost example]$ git branch

* main

topic

mainブランチで、topic1コミットのチェックサムを指定して取り込む。

git cherry-pic コミット指定

[vagrant@localhost example]$ git cherry-pick 675bca2
[main bcc3563] topic1
 Date: Sat Aug 14 10:43:45 2021 +0900
 1 file changed, 1 insertion(+)
 create mode 100644 topic1.txt

[vagrant@localhost example]$ git cherry-pick 675bca2

[main bcc3563] topic1

Date: Sat Aug 14 10:43:45 2021 +0900

1 file changed, 1 insertion(+)

create mode 100644 topic1.txt

結果は以下の通りで、topicブランチのtopic1コミットがmainブランチにマージされている。

[vagrant@localhost example]$ git log --all --graph
* commit bcc356384e895559e2e4eb9b96bf57ee3683c5be (HEAD -> main)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 10:43:45 2021 +0900
|
|     topic1
|
* commit 39851204a64b3392dd83f21147fc57ba5267f6fa (origin/main, origin/HEAD)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 10:47:01 2021 +0900
|
|     main1
|
| * commit d23428407b485123afa26306f95ba9a8ba9df742 (origin/topic, topic)
| | Author: taustation <taustation@gmail.com>
| | Date:   Sat Aug 14 10:44:40 2021 +0900
| |
| |     topic2
| |
| * commit 675bca2ec610a3552f44bd83673c32f47a5ab041
|/  Author: taustation <taustation@gmail.com>
|   Date:   Sat Aug 14 10:43:45 2021 +0900
|
|       topic1
|
* commit 8567dd9242b60bdf96ddd7a57f0434f087fe706d
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Sat Aug 14 10:27:48 2021 +0900

      Initial commit

[vagrant@localhost example]$ git log --all --graph

* commit bcc356384e895559e2e4eb9b96bf57ee3683c5be (HEAD -> main)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:43:45 2021 +0900

| topic1

* commit 39851204a64b3392dd83f21147fc57ba5267f6fa (origin/main, origin/HEAD)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:47:01 2021 +0900

| main1

| * commit d23428407b485123afa26306f95ba9a8ba9df742 (origin/topic, topic)

| | Author: taustation <taustation@gmail.com>

| | Date: Sat Aug 14 10:44:40 2021 +0900

| |

| | topic2

| |

| * commit 675bca2ec610a3552f44bd83673c32f47a5ab041

|/ Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:43:45 2021 +0900

| topic1

* commit 8567dd9242b60bdf96ddd7a57f0434f087fe706d

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 10:27:48 2021 +0900

Initial commit

暫定的なcherry-pick

-nオプション

コミットせずに確認だけしたい場合は-nオプションを付ける。そうすると、コミットはされずにステージングエリアに上げられた状態で留まる。

[vagrant@localhost example]$ git cherry-pick -n d234284

1	[vagrant@localhost example]$ git cherry-pick -n d234284

ワーキングツリーではファイルは作成されている。

[vagrant@localhost example]$ ls
README.md  main1.txt  topic1.txt  topic2.txt

1 2	[vagrant@localhost example]$ ls README.md main1.txt topic1.txt topic2.txt

しかしコミットされていないので、ログには反映されていない。

[vagrant@localhost example]$ git log --all --graph
* commit bcc356384e895559e2e4eb9b96bf57ee3683c5be (HEAD -> main)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 10:43:45 2021 +0900
|
|     topic1
|
* commit 39851204a64b3392dd83f21147fc57ba5267f6fa (origin/main, origin/HEAD)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 10:47:01 2021 +0900
|
|     main1
|
| * commit d23428407b485123afa26306f95ba9a8ba9df742 (origin/topic, topic)
| | Author: taustation <taustation@gmail.com>
| | Date:   Sat Aug 14 10:44:40 2021 +0900
| |
| |     topic2
| |
| * commit 675bca2ec610a3552f44bd83673c32f47a5ab041
|/  Author: taustation <taustation@gmail.com>
|   Date:   Sat Aug 14 10:43:45 2021 +0900
|
|       topic1
|
* commit 8567dd9242b60bdf96ddd7a57f0434f087fe706d
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Sat Aug 14 10:27:48 2021 +0900

      Initial commit

[vagrant@localhost example]$ git log --all --graph

* commit bcc356384e895559e2e4eb9b96bf57ee3683c5be (HEAD -> main)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:43:45 2021 +0900

| topic1

* commit 39851204a64b3392dd83f21147fc57ba5267f6fa (origin/main, origin/HEAD)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:47:01 2021 +0900

| main1

| * commit d23428407b485123afa26306f95ba9a8ba9df742 (origin/topic, topic)

| | Author: taustation <taustation@gmail.com>

| | Date: Sat Aug 14 10:44:40 2021 +0900

| |

| | topic2

| |

| * commit 675bca2ec610a3552f44bd83673c32f47a5ab041

|/ Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:43:45 2021 +0900

| topic1

* commit 8567dd9242b60bdf96ddd7a57f0434f087fe706d

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 10:27:48 2021 +0900

Initial commit

ファイルはステージングエリアにあり、コミット前の状態。

[vagrant@localhost example]$ git status
On branch main
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        new file:   topic2.txt

[vagrant@localhost example]$ git status

On branch main

Your branch is ahead of 'origin/main' by 1 commit.

(use "git push" to publish your local commits)

Changes to be committed:

(use "git restore --staged <file>..." to unstage)

new file: topic2.txt

暫定cherry-pickの破棄

暫定的なcherry-pickの内容を破棄したい場合は、addを取り消してファイルを削除する。

まず、git reset HEADでaddを取り消す。

[vagrant@localhost example]$ git reset HEAD
[vagrant@localhost example]$ git status
On branch main
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        topic2.txt

nothing added to commit but untracked files present (use "git add" to track)

[vagrant@localhost example]$ git reset HEAD

[vagrant@localhost example]$ git status

On branch main

Your branch is ahead of 'origin/main' by 1 commit.

(use "git push" to publish your local commits)

Untracked files:

(use "git add <file>..." to include in what will be committed)

topic2.txt

nothing added to commit but untracked files present (use "git add" to track)

そして作成されたファイルを削除。

[vagrant@localhost example]$ rm topic2.txt
[vagrant@localhost example]$ git status
On branch main
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean

[vagrant@localhost example]$ rm topic2.txt

[vagrant@localhost example]$ git status

On branch main

Your branch is ahead of 'origin/main' by 1 commit.

(use "git push" to publish your local commits)

nothing to commit, working tree clean

暫定cherry-pickのコミット

-nオプションによる暫定的なcherry-pickの結果を正式にコミットしたい場合は、git commitを実行する。

[vagrant@localhost example]$ git cherry-pick -n d234284
.....
[vagrant@localhost example]$ git commit -m "topic2 added"
[main 78d7fa4] topic2 added
 1 file changed, 1 insertion(+)
 create mode 100644 topic2.txt

[vagrant@localhost example]$ git cherry-pick -n d234284

.....

[vagrant@localhost example]$ git commit -m "topic2 added"

[main 78d7fa4] topic2 added

1 file changed, 1 insertion(+)

create mode 100644 topic2.txt

ログで確認。

[vagrant@localhost example]$ git log --all --graph
* commit 78d7fa46d6efba17f47328409025f7f7cd9da371 (HEAD -> main)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 11:09:45 2021 +0900
|
|     topic2 added
|
* commit bcc356384e895559e2e4eb9b96bf57ee3683c5be
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 10:43:45 2021 +0900
|
|     topic1
|
* commit 39851204a64b3392dd83f21147fc57ba5267f6fa (origin/main, origin/HEAD)
| Author: taustation <taustation@gmail.com>
| Date:   Sat Aug 14 10:47:01 2021 +0900
|
|     main1
|
| * commit d23428407b485123afa26306f95ba9a8ba9df742 (origin/topic, topic)
| | Author: taustation <taustation@gmail.com>
| | Date:   Sat Aug 14 10:44:40 2021 +0900
| |
| |     topic2
| |
| * commit 675bca2ec610a3552f44bd83673c32f47a5ab041
|/  Author: taustation <taustation@gmail.com>
|   Date:   Sat Aug 14 10:43:45 2021 +0900
|
|       topic1
|
* commit 8567dd9242b60bdf96ddd7a57f0434f087fe706d
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Sat Aug 14 10:27:48 2021 +0900

      Initial commit

[vagrant@localhost example]$ git log --all --graph

* commit 78d7fa46d6efba17f47328409025f7f7cd9da371 (HEAD -> main)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 11:09:45 2021 +0900

| topic2 added

* commit bcc356384e895559e2e4eb9b96bf57ee3683c5be

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:43:45 2021 +0900

| topic1

* commit 39851204a64b3392dd83f21147fc57ba5267f6fa (origin/main, origin/HEAD)

| Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:47:01 2021 +0900

| main1

| * commit d23428407b485123afa26306f95ba9a8ba9df742 (origin/topic, topic)

| | Author: taustation <taustation@gmail.com>

| | Date: Sat Aug 14 10:44:40 2021 +0900

| |

| | topic2

| |

| * commit 675bca2ec610a3552f44bd83673c32f47a5ab041

|/ Author: taustation <taustation@gmail.com>

| Date: Sat Aug 14 10:43:45 2021 +0900

| topic1

* commit 8567dd9242b60bdf96ddd7a57f0434f087fe706d

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sat Aug 14 10:27:48 2021 +0900

Initial commit

Git – reset – コミットの巻き戻し

2021-08-14 / tau / コメントする

概要

git resetは指定したコミットの実行直後まで処理を巻き戻す
それより後のコミットの実行結果は取り消され、履歴も消される
コミットの指定には、HEADからの相対指定による方法と対象コミットの絶対指定による方法がある
直前のresetのコミット位置はORIG_HEADに保持されているので、resetの取り消しは可能

準備

Git – タグで使った以下のリポジトリーを流用。

[vagrant@localhost example]$ git log -p
commit 23999faf48a9e9802371b691a58e5479888dcdc0 (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:50:41 2021 +0900

    commit-3

diff --git a/sample.txt b/sample.txt
index e05e5a6..597975d 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1,2 +1,3 @@
 新規作成
 1行追加
+もう1行追加

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

diff --git a/sample.txt b/sample.txt
index 26ca972..e05e5a6 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1 +1,2 @@
 新規作成
+1行追加

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: beta)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

diff --git a/sample.txt b/sample.txt
new file mode 100644
index 0000000..26ca972
--- /dev/null
+++ b/sample.txt
@@ -0,0 +1 @@
+新規作成

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c6fba08
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# example

[vagrant@localhost example]$ git log -p

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:50:41 2021 +0900

commit-3

diff --git a/sample.txt b/sample.txt

index e05e5a6..597975d 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1,2 +1,3 @@

新規作成

1行追加

+もう1行追加

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

diff --git a/sample.txt b/sample.txt

index 26ca972..e05e5a6 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1 +1,2 @@

新規作成

+1行追加

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: beta)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

diff --git a/sample.txt b/sample.txt

new file mode 100644

index 0000000..26ca972

--- /dev/null

+++ b/sample.txt

@@ -0,0 +1 @@

+新規作成

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

diff --git a/README.md b/README.md

new file mode 100644

index 0000000..c6fba08

--- /dev/null

+++ b/README.md

@@ -0,0 +1 @@

+# example

最新のsample.txtの内容を確認。

[vagrant@localhost example]$ cat sample.txt
新規作成
1行追加
もう1行追加

[vagrant@localhost example]$ cat sample.txt

新規作成

1行追加

もう1行追加

HEADからの相対位置でreset

HEADから2つ遡ったcommit-1終了時までresetするため、HEAD~~を指定。

get reset --hard HEAD~~

あるいは2つ前を数値指定することもできる。

get reset --hard HEAD~2

[vagrant@localhost example]$ git reset --hard HEAD~~
HEAD is now at f69f176 commit-1

1 2	[vagrant@localhost example]$ git reset --hard HEAD~~ HEAD is now at f69f176 commit-1

ログを確認すると、commit-1以降のコミットがなくなっている。

[vagrant@localhost example]$ git log
commit f69f176435cf6436c3b3329af644999ba96da862 (HEAD -> main, tag: beta)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit f69f176435cf6436c3b3329af644999ba96da862 (HEAD -> main, tag: beta)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

sample.txtの内容も、commit-1実行直後の内容になっている。

[vagrant@localhost example]$ cat sample.txt
新規作成

1 2	[vagrant@localhost example]$ cat sample.txt 新規作成

resetの取り消し～ORIG_HEAD

reset前のコミット位置はORIG_HEADに保持されている。以下のコマンドで、直前のresetを取り消すことができる。

git reset --hard ORIG_HEAD

[vagrant@localhost example]$ git reset --hard ORIG_HEAD
HEAD is now at 23999fa commit-3

1 2	[vagrant@localhost example]$ git reset --hard ORIG_HEAD HEAD is now at 23999fa commit-3

ログも元に戻っている。

[vagrant@localhost example]$ git log
commit 23999faf48a9e9802371b691a58e5479888dcdc0 (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:50:41 2021 +0900

    commit-3

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: beta)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:50:41 2021 +0900

commit-3

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: beta)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

コミットを絶対指定したreset

遡りたいコミットのチェックサム(の一部)やタグを指定してリセットできる。

先の例でcommit-1まで遡りたい場合、以下は等価。

git reset --hard f69f176435cf6436c3b3329af644999ba96da862
git reset --hard f69f176
git reset --hard beta

チェックサムの一部は元のチェックサムの一部になっていて、git log --onelineでも表示される。

[vagrant@localhost example]$ git log --oneline
23999fa (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD) commit-3
dd51a83 (tag: ver_1.1) commit-2
f69f176 (tag: beta) commit-1
449d5ea Initial commit

[vagrant@localhost example]$ git log --oneline

23999fa (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD) commit-3

dd51a83 (tag: ver_1.1) commit-2

f69f176 (tag: beta) commit-1

449d5ea Initial commit

Git – revert – 取り消しコミット

2021-08-14 / tau / コメントする

概要

“revert”は「元に戻す」意味。

git revertはコミットの内容を元に戻すためのrevertコミットを実行する
それまでのコミットの履歴を残したまま、その内容を打ち消す

準備

Git – タグで使った以下のリポジトリーを流用。

[vagrant@localhost example]$ git log
commit 23999faf48a9e9802371b691a58e5479888dcdc0 (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:50:41 2021 +0900

    commit-3

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: beta)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:50:41 2021 +0900

commit-3

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: beta)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

HEAD位置のコミットの内容を確認。commit-3でファイルに1行追加している。

[vagrant@localhost example]$ git show HEAD
commit 23999faf48a9e9802371b691a58e5479888dcdc0 (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:50:41 2021 +0900

    commit-3

diff --git a/sample.txt b/sample.txt
index e05e5a6..597975d 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1,2 +1,3 @@
 新規作成
 1行追加
+もう1行追加

[vagrant@localhost example]$ git show HEAD

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (HEAD -> main, tag: ver_2.0, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:50:41 2021 +0900

commit-3

diff --git a/sample.txt b/sample.txt

index e05e5a6..597975d 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1,2 +1,3 @@

新規作成

1行追加

+もう1行追加

sample.txtの内容も確認しておく。

[vagrant@localhost example]$ cat sample.txt
新規作成
1行追加
もう1行追加

[vagrant@localhost example]$ cat sample.txt

新規作成

1行追加

もう1行追加

revert実行

git revertでHEAD位置のコミットを指定。

git revert HEAD

実行するとエディターが起動し、revertコミットのデフォルトメッセージが表示される。

Revert "commit-3"

This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch main
# Your branch is up to date with 'origin/main'.
#
# Changes to be committed:
#       modified:   sample.txt
#
~
~
~
.....

Revert "commit-3"

This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

# On branch main

# Your branch is up to date with 'origin/main'.

# Changes to be committed:

# modified: sample.txt

.....

このままの内容で保存・終了すると、git revertの実行結果が表示されている。

[vagrant@localhost example]$ git revert HEAD
[main ce9546e] Revert "commit-3"
 1 file changed, 1 deletion(-)
[main ce9546e] Revert "commit-3"
 1 file changed, 1 deletion(-)

[vagrant@localhost example]$ git revert HEAD

[main ce9546e] Revert "commit-3"

1 file changed, 1 deletion(-)

[main ce9546e] Revert "commit-3"

1 file changed, 1 deletion(-)

ログを確認するとcommit-3は残ったままで、その後にRevert "commit-3"コミットが実行されている。

[vagrant@localhost example]$ git log
commit 2723928591f616489fb3aea124aac4478012b6cb (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 08:22:17 2021 +0900

    Revert "commit-3"

    This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (tag: ver_2.0, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:50:41 2021 +0900

    commit-3

.....

[vagrant@localhost example]$ git log

commit 2723928591f616489fb3aea124aac4478012b6cb (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 08:22:17 2021 +0900

Revert "commit-3"

This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (tag: ver_2.0, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:50:41 2021 +0900

commit-3

.....

ファイルの内容はcommit-3の実行前に戻っている。

[vagrant@localhost example]$ cat sample.txt
新規作成
1行追加

[vagrant@localhost example]$ cat sample.txt

新規作成

1行追加

revertのrevert

revertコミットをさらにrevertすると元に戻る。

[vagrant@localhost example]$ git revert HEAD
[main a40caba] Revert "Revert "commit-3""
 1 file changed, 1 insertion(+)
[main a40caba] Revert "Revert "commit-3""
 1 file changed, 1 insertion(+)

[vagrant@localhost example]$ git revert HEAD

[main a40caba] Revert "Revert "commit-3""

1 file changed, 1 insertion(+)

[main a40caba] Revert "Revert "commit-3""

1 file changed, 1 insertion(+)

ログにも2回のrivertコミットの記録が残る。

[vagrant@localhost example]$ git log
commit a40caba4203611174aa16f7ff4d912630f8f14d9 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 08:22:31 2021 +0900

    Revert "Revert "commit-3""

    This reverts commit 2723928591f616489fb3aea124aac4478012b6cb.

commit 2723928591f616489fb3aea124aac4478012b6cb
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 08:22:17 2021 +0900

    Revert "commit-3"

    This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (tag: ver_2.0, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:50:41 2021 +0900

    commit-3

.....

[vagrant@localhost example]$ git log

commit a40caba4203611174aa16f7ff4d912630f8f14d9 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 08:22:31 2021 +0900

Revert "Revert "commit-3""

This reverts commit 2723928591f616489fb3aea124aac4478012b6cb.

commit 2723928591f616489fb3aea124aac4478012b6cb

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 08:22:17 2021 +0900

Revert "commit-3"

This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (tag: ver_2.0, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:50:41 2021 +0900

commit-3

.....

sample.txtの内容も元に戻っている。

[vagrant@localhost example]$ cat sample.txt
新規作成
1行追加
もう1行追加

[vagrant@localhost example]$ cat sample.txt

新規作成

1行追加

もう1行追加

飛び越しはできない

冒頭のログの状態で、直前のコミットの1つ前のコミットを直接revertしようとするとエラー。

[vagrant@localhost example]$ git revert ver_1.1
Auto-merging sample.txt
CONFLICT (content): Merge conflict in sample.txt
error: could not revert dd51a83... commit-2
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

[vagrant@localhost example]$ git revert ver_1.1

Auto-merging sample.txt

CONFLICT (content): Merge conflict in sample.txt

error: could not revert dd51a83... commit-2

hint: after resolving the conflicts, mark the corrected paths

hint: with 'git add <paths>' or 'git rm <paths>'

hint: and commit the result with 'git commit'

1つずつ遡るのは可能

まず直前のコミットをrevert。

[vagrant@localhost example]$ git revert HEAD
[main 6deb4a2] Revert "commit-3"
 1 file changed, 1 deletion(-)
[main 6deb4a2] Revert "commit-3"
 1 file changed, 1 deletion(-)

[vagrant@localhost example]$ git revert HEAD

[main 6deb4a2] Revert "commit-3"

1 file changed, 1 deletion(-)

[main 6deb4a2] Revert "commit-3"

1 file changed, 1 deletion(-)

ログ確認。

[vagrant@localhost example]$ git log
commit 6deb4a23beb263943722dc5da7110f24f8dbcb92 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 08:29:49 2021 +0900

    Revert "commit-3"

    This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (tag: ver_2.0, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:50:41 2021 +0900

    commit-3

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

.....

[vagrant@localhost example]$ git log

commit 6deb4a23beb263943722dc5da7110f24f8dbcb92 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 08:29:49 2021 +0900

Revert "commit-3"

This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (tag: ver_2.0, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:50:41 2021 +0900

commit-3

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

.....

その上でcommit-2(ver_1.1タグ)のコミットをrevertは可能。

[vagrant@localhost example]$ git revert ver_1.1
[main da9e6ed] Revert "commit-2"
 1 file changed, 1 deletion(-)

[vagrant@localhost example]$ git revert ver_1.1

[main da9e6ed] Revert "commit-2"

1 file changed, 1 deletion(-)

ログには2回のrevertコミットが残っていて、コミットを遡りながら1行ずつ追加された行を削除している。

[vagrant@localhost example]$ git log -p
commit da9e6ed668f086bda49e5d7f6e0ca5c4b69752d5 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 08:30:03 2021 +0900

    Revert "commit-2"

    This reverts commit dd51a8331d349b7641d6a95729af16ee3989ecd8.

diff --git a/sample.txt b/sample.txt
index e05e5a6..26ca972 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1,2 +1 @@
 新規作成
-1行追加

commit 6deb4a23beb263943722dc5da7110f24f8dbcb92
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 08:29:49 2021 +0900

    Revert "commit-3"

    This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

diff --git a/sample.txt b/sample.txt
index 597975d..e05e5a6 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1,3 +1,2 @@
 新規作成
 1行追加
-もう1行追加

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (tag: ver_2.0, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:50:41 2021 +0900

    commit-3

diff --git a/sample.txt b/sample.txt
index e05e5a6..597975d 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1,2 +1,3 @@
 新規作成
 1行追加
+もう1行追加

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

diff --git a/sample.txt b/sample.txt
index 26ca972..e05e5a6 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1 +1,2 @@
 新規作成
+1行追加

.....

[vagrant@localhost example]$ git log -p

commit da9e6ed668f086bda49e5d7f6e0ca5c4b69752d5 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 08:30:03 2021 +0900

Revert "commit-2"

This reverts commit dd51a8331d349b7641d6a95729af16ee3989ecd8.

diff --git a/sample.txt b/sample.txt

index e05e5a6..26ca972 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1,2 +1 @@

新規作成

-1行追加

commit 6deb4a23beb263943722dc5da7110f24f8dbcb92

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 08:29:49 2021 +0900

Revert "commit-3"

This reverts commit 23999faf48a9e9802371b691a58e5479888dcdc0.

diff --git a/sample.txt b/sample.txt

index 597975d..e05e5a6 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1,3 +1,2 @@

新規作成

1行追加

-もう1行追加

commit 23999faf48a9e9802371b691a58e5479888dcdc0 (tag: ver_2.0, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:50:41 2021 +0900

commit-3

diff --git a/sample.txt b/sample.txt

index e05e5a6..597975d 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1,2 +1,3 @@

新規作成

1行追加

+もう1行追加

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

diff --git a/sample.txt b/sample.txt

index 26ca972..e05e5a6 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1 +1,2 @@

新規作成

+1行追加

.....

ファイルはcommit-2実行前の状態に戻っている。

[vagrant@localhost example]$ cat sample.txt
新規作成

1 2	[vagrant@localhost example]$ cat sample.txt 新規作成

Git – タグ

2021-08-14 / tau / コメントする

準備

GitHubに空のリポジトリーを作ってクローン。

[vagrant@localhost git]$ git clone git@github.com:taustation/example.git
Cloning into 'example'...
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (3/3), done.
[vagrant@localhost git]$ cd example
[vagrant@localhost git]$ cd example/

[vagrant@localhost git]$ git clone git@github.com:taustation/example.git

Cloning into 'example'...

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 3, done.

remote: Counting objects: 100% (3/3), done.

remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0

Receiving objects: 100% (3/3), done.

[vagrant@localhost git]$ cd example

[vagrant@localhost git]$ cd example/

軽量タグ(lightweight)

コミット

ファイルを1つ作成してコミット。

[vagrant@localhost example]$ vi sample.txt
[vagrant@localhost example]$ cat sample.txt
新規作成
[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit -m "commit-1"
[main f69f176] commit-1
 1 file changed, 1 insertion(+)
 create mode 100644 sample.txt

[vagrant@localhost example]$ vi sample.txt

[vagrant@localhost example]$ cat sample.txt

新規作成

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit -m "commit-1"

[main f69f176] commit-1

1 file changed, 1 insertion(+)

create mode 100644 sample.txt

コミット後のログ。

[vagrant@localhost example]$ git log
commit f69f176435cf6436c3b3329af644999ba96da862 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit f69f176435cf6436c3b3329af644999ba96da862 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

タグ付け～`git tag ...`

HEADがあるコミットにタグをつけるには以下のコマンド。

git tag タグ名

[vagrant@localhost example]$ git tag version_new

1	[vagrant@localhost example]$ git tag version_new

ログにタグが反映された。

[vagrant@localhost example]$ git log
commit f69f176435cf6436c3b3329af644999ba96da862 (HEAD -> main, tag: version_new)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit f69f176435cf6436c3b3329af644999ba96da862 (HEAD -> main, tag: version_new)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

注釈付きタグ(annotated)

コミット

ファイルに変更を加えてコミット。

[vagrant@localhost example]$ vi sample.txt
[vagrant@localhost example]$ cat sample.txt
新規作成
1行追加
[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit -m "commit-2"
[main dd51a83] commit-2
 1 file changed, 1 insertion(+)

[vagrant@localhost example]$ vi sample.txt

[vagrant@localhost example]$ cat sample.txt

新規作成

1行追加

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit -m "commit-2"

[main dd51a83] commit-2

1 file changed, 1 insertion(+)

タグ付け～`git tag -a ... -m ...`

このコミットに注釈付きタグをつける。

git tag -a タグ名 -m "注釈"

[vagrant@localhost example]$ git tag -a ver_1.1 -m "sample.txtに1行追加"

1	[vagrant@localhost example]$ git tag -a ver_1.1 -m "sample.txtに1行追加"

ログでの表示は軽量版と同じ。

[vagrant@localhost example]$ git log
commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (HEAD -> main, tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: version_new)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (HEAD -> main, tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: version_new)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

タグの一覧

タグ名のみ～`git tag`

タグ名のみの一覧はgit tagで表示できる。

[vagrant@localhost example]$ git tag
ver_1.1
version_new

[vagrant@localhost example]$ git tag

ver_1.1

version_new

注釈付き～`git tag -n`

タグの注釈も含めて表示するには以下のコマンド。軽量版はコミットのコメントが表示される。

git tag -n

[vagrant@localhost example]$ git tag -n
ver_1.1         sample.txtに1行追加
version_new     commit-1

[vagrant@localhost example]$ git tag -n

ver_1.1 sample.txtに1行追加

version_new commit-1

タグの削除～`git tag -d`

タグ名を指定して削除するコマンド。

git tag -d タグ名

[vagrant@localhost example]$ git tag -d version_new
Deleted tag 'version_new' (was f69f176)

1 2	[vagrant@localhost example]$ git tag -d version_new Deleted tag 'version_new' (was f69f176)

タグ一覧で削除の確認。

[vagrant@localhost example]$ git tag
ver_1.1

1 2	[vagrant@localhost example]$ git tag ver_1.1

ログで削除の確認。

[vagrant@localhost example]$ git log
commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (HEAD -> main, tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

commit f69f176435cf6436c3b3329af644999ba96da862
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (HEAD -> main, tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

commit f69f176435cf6436c3b3329af644999ba96da862

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

過去のコミットへのタグ付け

特定のコミットにタグをつける場合は、コミットのチェックサム(一部でもよい)を指定する。

git tag タグ名チェックサム(の一部)

[vagrant@localhost example]$ git tag beta f69f176435cf6436c3b3329af644999ba96da862
[vagrant@localhost example]$ git tag
beta
ver_1.1

[vagrant@localhost example]$ git tag beta f69f176435cf6436c3b3329af644999ba96da862

[vagrant@localhost example]$ git tag

beta

ver_1.1

タグの追加の確認。

[vagrant@localhost example]$ git log
commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (HEAD -> main, tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: beta)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:27:02 2021 +0900

    commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 15:03:31 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (HEAD -> main, tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

commit f69f176435cf6436c3b3329af644999ba96da862 (tag: beta)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:27:02 2021 +0900

commit-1

commit 449d5ea9fec38c9aec00d22d28f3db88902046c4 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 15:03:31 2021 +0900

Initial commit

タグの詳細表示～`git show ...`

タグの突いたコミットの詳細を見るのにgit showでコミットのチェックサムを指定する代わりにタグ名を指定できる。注釈付きタグの場合は、タグに関する情報も表示される。

[vagrant@localhost example]$ git show ver_1.1
tag ver_1.1
Tagger: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:33:15 2021 +0900

sample.txtに1行追加

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 15:32:15 2021 +0900

    commit-2

diff --git a/sample.txt b/sample.txt
index 26ca972..e05e5a6 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1 +1,2 @@
 新規作成
+1行追加

[vagrant@localhost example]$ git show ver_1.1

tag ver_1.1

Tagger: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:33:15 2021 +0900

sample.txtに1行追加

commit dd51a8331d349b7641d6a95729af16ee3989ecd8 (tag: ver_1.1)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 15:32:15 2021 +0900

commit-2

diff --git a/sample.txt b/sample.txt

index 26ca972..e05e5a6 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1 +1,2 @@

新規作成

+1行追加

リモートへの反映～`git push --tags`

単にgit pushしただけではタグは反映されない。

[vagrant@localhost example]$ git push
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (6/6), 545 bytes | 545.00 KiB/s, done.
Total 6 (delta 0), reused 0 (delta 0)
To github.com:taustation/example.git
   449d5ea..dd51a83  main -> main

[vagrant@localhost example]$ git push

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

Enumerating objects: 7, done.

Counting objects: 100% (7/7), done.

Compressing objects: 100% (4/4), done.

Writing objects: 100% (6/6), 545 bytes | 545.00 KiB/s, done.

Total 6 (delta 0), reused 0 (delta 0)

To github.com:taustation/example.git

449d5ea..dd51a83 main -> main

上部のtagsが0のまま。

タグをリモートに反映させるには、以下のように--tagsオプションをつける

git push --tags

ただしgit push --tagsはタグのみをプッシュする。

[vagrant@localhost example]$ git push --tags
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 183 bytes | 183.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To github.com:taustation/example.git
 * [new tag]         beta -> beta
 * [new tag]         ver_1.1 -> ver_1.1

[vagrant@localhost example]$ git push --tags

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

Enumerating objects: 1, done.

Counting objects: 100% (1/1), done.

Writing objects: 100% (1/1), 183 bytes | 183.00 KiB/s, done.

Total 1 (delta 0), reused 0 (delta 0)

To github.com:taustation/example.git

* [new tag] beta -> beta

* [new tag] ver_1.1 -> ver_1.1

tagsが2となっている。

tagsをクリックするとタグ一覧が表示され、そのコミットに飛んだりzipをダウンロードできる。

Git – amend – 直前のコミットの修正

2021-08-14 / tau / コメントする

概要

git commit --amendは、直前のコミットの内容を修正する。

直前のコミットが対象→2つ以上前のコミットは修正できない
コミットメッセージの修正
ファイルなどのコミット追加→ファイルなどの削除はできない

参考サイト：コミットの修正には git commit –amend が便利

準備

以下のローカルリポジトリーexampleを使う。

ファイル作成とファイル修正の2つのコミット。

[vagrant@localhost example]$ git log
commit 0cf9c73b3ed2dad326f6a75dfa27542396792744 (HEAD -> master)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:54 2021 +0900

    modify sample.txt

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:02 2021 +0900

    create sample.txt

[vagrant@localhost example]$ git log

commit 0cf9c73b3ed2dad326f6a75dfa27542396792744 (HEAD -> master)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:54 2021 +0900

modify sample.txt

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:02 2021 +0900

create sample.txt

コミット後のファイルの内容。

[vagrant@localhost example]$ cat sample.txt
新規作成ファイル
1行追加

[vagrant@localhost example]$ cat sample.txt

新規作成ファイル

1行追加

直前のコミットのコメントを修正する

エディターでコメント修正

以下のコマンドを実行するとエディター画面が開く。

git commit --amend

エディターに現在のコミットメッセージが表示されているので、必要な内容に変更する。

modify sample.txt

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Sat Aug 14 00:18:54 2021 +0900
#
# On branch master
# Changes to be committed:
#       modified:   sample.txt
#
~
~
~
.....

modify sample.txt

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

# Date: Sat Aug 14 00:18:54 2021 +0900

# On branch master

# Changes to be committed:

# modified: sample.txt

.....

以下のように修正して保存・エディター終了。

MODIFY sample.txt

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
.....

MODIFY sample.txt

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

.....

エディターを終了すると、コマンドラインに実行結果が表示されている。

[vagrant@localhost example]$ git commit --amend
[master cee8397] MODIFY sample.txt
 Date: Sat Aug 14 00:18:54 2021 +0900
 1 file changed, 1 insertion(+)
[vagrant@localhost example]$ [master cee8397] MODIFY sample.txt
 Date: Sat Aug 14 00:18:54 2021 +0900
 1 file changed, 1 insertion(+)

[vagrant@localhost example]$ git commit --amend

[master cee8397] MODIFY sample.txt

Date: Sat Aug 14 00:18:54 2021 +0900

1 file changed, 1 insertion(+)

[vagrant@localhost example]$ [master cee8397] MODIFY sample.txt

Date: Sat Aug 14 00:18:54 2021 +0900

1 file changed, 1 insertion(+)

ログを確認すると、変更が反映されている。

[vagrant@localhost example]$ git log
commit cee8397e7a77f077634b6beb26f9e95f812a839f (HEAD -> master)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:54 2021 +0900

    MODIFY sample.txt

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:02 2021 +0900

    create sample.txt

[vagrant@localhost example]$ git log

commit cee8397e7a77f077634b6beb26f9e95f812a839f (HEAD -> master)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:54 2021 +0900

MODIFY sample.txt

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:02 2021 +0900

create sample.txt

コマンドラインでコメント設定

-mオプションでコミットメッセージを指定すると、エディターは起動せず、指定した内容でメッセージが書き換えられる。

git gommit --amend -m "メッセージ"

[vagrant@localhost example]$ git commit --amend -m "sample.txtを変更"
[master 9d7b6af] sample.txtを変更
 Date: Sat Aug 14 00:18:54 2021 +0900
 1 file changed, 1 insertion(+)

[vagrant@localhost example]$ git commit --amend -m "sample.txtを変更"

[master 9d7b6af] sample.txtを変更

Date: Sat Aug 14 00:18:54 2021 +0900

1 file changed, 1 insertion(+)

ログで確認。

[vagrant@localhost example]$ git log
commit 9d7b6af90cdbc0b2a47620eaefd0fac92be0fa6c (HEAD -> master)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:54 2021 +0900

    sample.txtを変更

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:02 2021 +0900

    create sample.txt

[vagrant@localhost example]$ git log

commit 9d7b6af90cdbc0b2a47620eaefd0fac92be0fa6c (HEAD -> master)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:54 2021 +0900

sample.txtを変更

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:02 2021 +0900

create sample.txt

直前のコミットに追加修正する

既存ファイルを修正～メッセージ変更なし

以下のコマンドは、コミットメッセージの編集をしない。ステージングされている操作があればコミットに追加される。

git commit --amend --no-edit

たとえばsample.txtにもう1行追加する作業を忘れていて、これを最後のコミットに加えたいとする。

[vagrant@localhost example]$ vi sample.txt
[vagrant@localhost example]$ cat sample.txt
新規作成ファイル
1行追加
もう1行追加

[vagrant@localhost example]$ vi sample.txt

[vagrant@localhost example]$ cat sample.txt

新規作成ファイル

1行追加

もう1行追加

git addした後、amendを実行。

[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit --amend --no-edit
[master f48b0d0] sample.txtを変更
 Date: Sat Aug 14 00:18:54 2021 +0900
 1 file changed, 2 insertions(+)

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit --amend --no-edit

[master f48b0d0] sample.txtを変更

Date: Sat Aug 14 00:18:54 2021 +0900

1 file changed, 2 insertions(+)

git log -pで確認すると、最後のコミットで2行追加されている。コミットメッセージは変わっていない。

[vagrant@localhost example]$ git log -p
commit f48b0d01a1989308cb6d9349db18a6010d6208a5 (HEAD -> master)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:54 2021 +0900

    sample.txtを変更

diff --git a/sample.txt b/sample.txt
index 9000dab..02dbfa3 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1 +1,3 @@
 新規作成ファイル
+1行追加
+もう1行追加

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:02 2021 +0900

    create sample.txt

diff --git a/sample.txt b/sample.txt
new file mode 100644
index 0000000..9000dab
--- /dev/null
+++ b/sample.txt
@@ -0,0 +1 @@
+新規作成ファイル

[vagrant@localhost example]$ git log -p

commit f48b0d01a1989308cb6d9349db18a6010d6208a5 (HEAD -> master)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:54 2021 +0900

sample.txtを変更

diff --git a/sample.txt b/sample.txt

index 9000dab..02dbfa3 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1 +1,3 @@

新規作成ファイル

+1行追加

+もう1行追加

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:02 2021 +0900

create sample.txt

diff --git a/sample.txt b/sample.txt

new file mode 100644

index 0000000..9000dab

--- /dev/null

+++ b/sample.txt

@@ -0,0 +1 @@

+新規作成ファイル

新たなファイルを追加～追加とメッセージ変更

たとえば別のファイルsample2.txtを作成し、これも最後のコミットに追加したいとする。

[vagrant@localhost example]$ vi sample2.txt
[vagrant@localhost example]$ cat sample2.txt
別のファイル

[vagrant@localhost example]$ vi sample2.txt

[vagrant@localhost example]$ cat sample2.txt

別のファイル

git addでステージングし、amendを実行する。今度は--no-editではなく、-mオプションで新たにファイルを追加したメッセージに変更。

[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit --amend -m "sample.txt変更とsample2.txt作成"
[master 41ed3a9] sample.txt変更とsample2.txt作成
 Date: Sat Aug 14 00:18:54 2021 +0900
 2 files changed, 3 insertions(+)
 create mode 100644 sample2.txt

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit --amend -m "sample.txt変更とsample2.txt作成"

[master 41ed3a9] sample.txt変更とsample2.txt作成

Date: Sat Aug 14 00:18:54 2021 +0900

2 files changed, 3 insertions(+)

create mode 100644 sample2.txt

git log -pで確認すると、最後のコミットにsample.txtの2つの追加とsample2.txtの追加が全て盛り込まれている。

[vagrant@localhost example]$ git log -p
commit 41ed3a926ff48f9b7bf92592d792894a551308c9 (HEAD -> master)
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:54 2021 +0900

    sample.txt変更とsample2.txt作成

diff --git a/sample.txt b/sample.txt
index 9000dab..02dbfa3 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1 +1,3 @@
 新規作成ファイル
+1行追加
+もう1行追加
diff --git a/sample2.txt b/sample2.txt
new file mode 100644
index 0000000..5c0ff6a
--- /dev/null
+++ b/sample2.txt
@@ -0,0 +1 @@
+別のファイル

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a
Author: taustation <taustation@gmail.com>
Date:   Sat Aug 14 00:18:02 2021 +0900

    create sample.txt

diff --git a/sample.txt b/sample.txt
new file mode 100644
index 0000000..9000dab
--- /dev/null
+++ b/sample.txt
@@ -0,0 +1 @@
+新規作成ファイル

[vagrant@localhost example]$ git log -p

commit 41ed3a926ff48f9b7bf92592d792894a551308c9 (HEAD -> master)

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:54 2021 +0900

sample.txt変更とsample2.txt作成

diff --git a/sample.txt b/sample.txt

index 9000dab..02dbfa3 100644

--- a/sample.txt

+++ b/sample.txt

@@ -1 +1,3 @@

新規作成ファイル

+1行追加

+もう1行追加

diff --git a/sample2.txt b/sample2.txt

new file mode 100644

index 0000000..5c0ff6a

--- /dev/null

+++ b/sample2.txt

@@ -0,0 +1 @@

+別のファイル

commit 2717c5ba08cf4fe1d562ac1bba484bb30bcf035a

Author: taustation <taustation@gmail.com>

Date: Sat Aug 14 00:18:02 2021 +0900

create sample.txt

diff --git a/sample.txt b/sample.txt

new file mode 100644

index 0000000..9000dab

--- /dev/null

+++ b/sample.txt

@@ -0,0 +1 @@

+新規作成ファイル

Git – リモート – push時エラー～no-fast-forward

2021-08-13 / tau / コメントする

概要

ローカルでの作業結果をリモートにpushしようとしたとき、その間に他のユーザーがリモートに変更を加えていると、エラーになりpushできない
そのようなときは、リモートからpullまたはfetch & mergeで変更内容をローカルにマージし、その結果をpushする

準備

リモートリポジトリーの準備

あらかじめ空のリモートリポジトリーexampleを準備しておく。以降、これに対してローカルで2人のユーザーを想定して変更を加える。

user1の作成とクローン

ローカルでuser1ディレクトリーを作成し、そこにリモートリポジトリーをクローンして移動。

[vagrant@localhost git]$ mkdir user1 && cd user1
[vagrant@localhost user1]$ git clone git@github.com:taustation/example.git
Cloning into 'example'...
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (3/3), done.
[vagrant@localhost user1]$ cd example/

[vagrant@localhost git]$ mkdir user1 && cd user1

[vagrant@localhost user1]$ git clone git@github.com:taustation/example.git

Cloning into 'example'...

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 3, done.

remote: Counting objects: 100% (3/3), done.

remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0

Receiving objects: 100% (3/3), done.

[vagrant@localhost user1]$ cd example/

ローカルのログ。

[vagrant@localhost example]$ git log
commit 2a3e7602dcfe8f83868eb3d85556786de571b043 (HEAD -> main, origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 09:20:42 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 2a3e7602dcfe8f83868eb3d85556786de571b043 (HEAD -> main, origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 09:20:42 2021 +0900

Initial commit

同様にuser2ディレクトリーを作成し、そこにもリモートリポジトリーをクローンして移動。

[vagrant@localhost git]$ mkdir user2 && cd user2
[vagrant@localhost user2]$ git clone git@github.com:taustation/example.git
Cloning into 'example'...
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (3/3), done.
[vagrant@localhost user2]$ cd example/

[vagrant@localhost git]$ mkdir user2 && cd user2

[vagrant@localhost user2]$ git clone git@github.com:taustation/example.git

Cloning into 'example'...

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 3, done.

remote: Counting objects: 100% (3/3), done.

remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0

Receiving objects: 100% (3/3), done.

[vagrant@localhost user2]$ cd example/

ログはuser1と同じ内容。

[vagrant@localhost example]$ git log
commit 2a3e7602dcfe8f83868eb3d85556786de571b043 (HEAD -> main, origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 09:20:42 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 2a3e7602dcfe8f83868eb3d85556786de571b043 (HEAD -> main, origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 09:20:42 2021 +0900

Initial commit

user1によるコミット・プッシュ

user1で新規ファイルを作成してコミット。

[vagrant@localhost example]$ vi user1.txt
[vagrant@localhost example]$ cat user1.txt
user1による新規追加
[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit -m "created user1.txt"
[main f515a8a] created user1.txt
 1 file changed, 1 insertion(+)
 create mode 100644 user1.txt

[vagrant@localhost example]$ vi user1.txt

[vagrant@localhost example]$ cat user1.txt

user1による新規追加

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit -m "created user1.txt"

[main f515a8a] created user1.txt

1 file changed, 1 insertion(+)

create mode 100644 user1.txt

ローカルのログには新たなコミットが加わっている。

[vagrant@localhost example]$ git log
commit f515a8ade4ea3d225cff1dd374895acf313ceca1 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:31:33 2021 +0900

    created user1.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 09:20:42 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit f515a8ade4ea3d225cff1dd374895acf313ceca1 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:31:33 2021 +0900

created user1.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 09:20:42 2021 +0900

Initial commit

この内容でリモートにプッシュする。リモートには新たなコミットが追加されるが、user1側のローカルには反映されない。

[vagrant@localhost example]$ git push
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 304 bytes | 304.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:taustation/example.git
   2a3e760..f515a8a  main -> main

[vagrant@localhost example]$ git push

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

Enumerating objects: 4, done.

Counting objects: 100% (4/4), done.

Compressing objects: 100% (2/2), done.

Writing objects: 100% (3/3), 304 bytes | 304.00 KiB/s, done.

Total 3 (delta 0), reused 0 (delta 0)

To github.com:taustation/example.git

2a3e760..f515a8a main -> main

user2によるコミット・プッシュ・エラー

現時点でuser2のローカルリポジトリーの内容がリモートと異なっている状態で、user2でファイルを作成・コミット。

[vagrant@localhost example]$ vi user2.txt
[vagrant@localhost example]$ cat user2.txt
user2による新規追加
[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit -m "created user2.txt"
[main 8ead5ca] created user2.txt
 1 file changed, 1 insertion(+)
 create mode 100644 user2.txt

[vagrant@localhost example]$ vi user2.txt

[vagrant@localhost example]$ cat user2.txt

user2による新規追加

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit -m "created user2.txt"

[main 8ead5ca] created user2.txt

1 file changed, 1 insertion(+)

create mode 100644 user2.txt

user2のローカルのログでは、user1のコミットは当然反映されていない。

[vagrant@localhost example]$ git log
commit 8ead5caf0200c88e2b6fa70ddc2ff9d97d535da8 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:33:29 2021 +0900

    created user2.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043 (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 09:20:42 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 8ead5caf0200c88e2b6fa70ddc2ff9d97d535da8 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:33:29 2021 +0900

created user2.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043 (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 09:20:42 2021 +0900

Initial commit

この状態でuser2からコミット結果をプッシュしようとすると、リモートリポジトリーがその後の作業結果を含んでいるので更新できない、とエラーになる。

[vagrant@localhost example]$ git push
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
To github.com:taustation/example.git
 ! [rejected]        main -> main (fetch first)
error: failed to push some refs to 'git@github.com:taustation/example.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.

[vagrant@localhost example]$ git push

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

To github.com:taustation/example.git

! [rejected] main -> main (fetch first)

error: failed to push some refs to 'git@github.com:taustation/example.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.

対応処理

このようなエラーの場合、リモートの内容をgit pullするか、フェッチ後にマージする。ここではfetch & mergeで進める。

フェッチ

まずリモートの内容をフェッチ。

[vagrant@localhost example]$ git fetch
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From github.com:taustation/example
   2a3e760..f515a8a  main       -> origin/main

[vagrant@localhost example]$ git fetch

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 4, done.

remote: Counting objects: 100% (4/4), done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0

Unpacking objects: 100% (3/3), done.

From github.com:taustation/example

2a3e760..f515a8a main -> origin/main

フェッチされたリポジトリーFETCH_HEADに移動。

[vagrant@localhost example]$ git checkout FETCH_HEAD
Note: switching to 'FETCH_HEAD'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at f515a8a created user1.txt

[vagrant@localhost example]$ git checkout FETCH_HEAD

Note: switching to 'FETCH_HEAD'.

You are in 'detached HEAD' state. You can look around, make experimental

changes and commit them, and you can discard any commits you make in this

state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may

do so (now or later) by using -c with the switch command. Example:

git switch -c <new-branch-name>

Or undo this operation with:

git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at f515a8a created user1.txt

フェッチされた内容のログ。user2クローン後のuser1による変更が記録されている。

[vagrant@localhost example]$ git log
commit f515a8ade4ea3d225cff1dd374895acf313ceca1 (HEAD, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:31:33 2021 +0900

    created user1.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 09:20:42 2021 +0900

    Initial commit
[vagrant@localhost example]$ git branch
* (HEAD detached at FETCH_HEAD)
  main

[vagrant@localhost example]$ git log

commit f515a8ade4ea3d225cff1dd374895acf313ceca1 (HEAD, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:31:33 2021 +0900

created user1.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 09:20:42 2021 +0900

Initial commit

[vagrant@localhost example]$ git branch

* (HEAD detached at FETCH_HEAD)

main

マージ

mainブランチに移動

[vagrant@localhost example]$ git branch
* (HEAD detached at FETCH_HEAD)
  main
[vagrant@localhost example]$ git checkout main
Previous HEAD position was f515a8a created user1.txt
Switched to branch 'main'
Your branch and 'origin/main' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

[vagrant@localhost example]$ git branch

* (HEAD detached at FETCH_HEAD)

main

[vagrant@localhost example]$ git checkout main

Previous HEAD position was f515a8a created user1.txt

Switched to branch 'main'

Your branch and 'origin/main' have diverged,

and have 1 and 1 different commits each, respectively.

(use "git pull" to merge the remote branch into yours)

作業中のmainブランチにフェッチされた内容をマージ。このマージはno-faseet-forwardになるので、エディターが立ち上がる。

[vagrant@localhost example]$ git merge FETCH_HEAD
Merge made by the 'recursive' strategy.
 user1.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 user1.txt

[vagrant@localhost example]$ git merge FETCH_HEAD

Merge made by the 'recursive' strategy.

user1.txt | 1 +

1 file changed, 1 insertion(+)

create mode 100644 user1.txt

マージ後のログ。user1、user2のコミットが含まれ、マージコミットが加わっている。

[vagrant@localhost example]$ git log
commit 30dc6433f7e4519d8a4c4ff9288812aed1d9bba9 (HEAD -> main)
Merge: 8ead5ca f515a8a
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:48:22 2021 +0900

    Merge branch 'main' of github.com:taustation/example into main
    merging user1's work by user2

commit 8ead5caf0200c88e2b6fa70ddc2ff9d97d535da8
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:33:29 2021 +0900

    created user2.txt

commit f515a8ade4ea3d225cff1dd374895acf313ceca1 (origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:31:33 2021 +0900

    created user1.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 09:20:42 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 30dc6433f7e4519d8a4c4ff9288812aed1d9bba9 (HEAD -> main)

Merge: 8ead5ca f515a8a

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:48:22 2021 +0900

Merge branch 'main' of github.com:taustation/example into main

merging user1's work by user2

commit 8ead5caf0200c88e2b6fa70ddc2ff9d97d535da8

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:33:29 2021 +0900

created user2.txt

commit f515a8ade4ea3d225cff1dd374895acf313ceca1 (origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:31:33 2021 +0900

created user1.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 09:20:42 2021 +0900

Initial commit

git log --graphでも確認。

*   commit 30dc6433f7e4519d8a4c4ff9288812aed1d9bba9 (HEAD -> main, origin/main, origin/HEAD)
|\  Merge: 8ead5ca f515a8a
| | Author: taustation <taustation@gmail.com>
| | Date:   Fri Aug 13 09:48:22 2021 +0900
| |
| |     Merge branch 'main' of github.com:taustation/example into main
| |     merging user1's work by user2
| |
| * commit f515a8ade4ea3d225cff1dd374895acf313ceca1
| | Author: taustation <taustation@gmail.com>
| | Date:   Fri Aug 13 09:31:33 2021 +0900
| |
| |     created user1.txt
| |
* | commit 8ead5caf0200c88e2b6fa70ddc2ff9d97d535da8
|/  Author: taustation <taustation@gmail.com>
|   Date:   Fri Aug 13 09:33:29 2021 +0900
|
|       created user2.txt
|
* commit 2a3e7602dcfe8f83868eb3d85556786de571b043
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Fri Aug 13 09:20:42 2021 +0900

      Initial commit

* commit 30dc6433f7e4519d8a4c4ff9288812aed1d9bba9 (HEAD -> main, origin/main, origin/HEAD)

|\ Merge: 8ead5ca f515a8a

| | Author: taustation <taustation@gmail.com>

| | Date: Fri Aug 13 09:48:22 2021 +0900

| |

| | Merge branch 'main' of github.com:taustation/example into main

| | merging user1's work by user2

| |

| * commit f515a8ade4ea3d225cff1dd374895acf313ceca1

| | Author: taustation <taustation@gmail.com>

| | Date: Fri Aug 13 09:31:33 2021 +0900

| |

| | created user1.txt

| |

* | commit 8ead5caf0200c88e2b6fa70ddc2ff9d97d535da8

|/ Author: taustation <taustation@gmail.com>

| Date: Fri Aug 13 09:33:29 2021 +0900

| created user2.txt

* commit 2a3e7602dcfe8f83868eb3d85556786de571b043

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 09:20:42 2021 +0900

Initial commit

プッシュ

マージされた内容で、改めてプッシュ。

[vagrant@localhost example]$ git push
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (5/5), 577 bytes | 577.00 KiB/s, done.
Total 5 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), done.
To github.com:taustation/example.git
   f515a8a..30dc643  main -> main

[vagrant@localhost example]$ git push

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

Enumerating objects: 7, done.

Counting objects: 100% (7/7), done.

Compressing objects: 100% (4/4), done.

Writing objects: 100% (5/5), 577 bytes | 577.00 KiB/s, done.

Total 5 (delta 1), reused 0 (delta 0)

remote: Resolving deltas: 100% (1/1), done.

To github.com:taustation/example.git

f515a8a..30dc643 main -> main

リモートへの繁栄の確認

プッシュ後のリモートの内容をuser1でプル。

[vagrant@localhost example]$ git pull
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (7/7), done.
remote: Compressing objects: 100% (3/3), done.
Unpacking objects: 100% (5/5), done.
remote: Total 5 (delta 1), reused 5 (delta 1), pack-reused 0
From github.com:taustation/example
   f515a8a..30dc643  main       -> origin/main
Updating f515a8a..30dc643
Fast-forward
 user2.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 user2.txt

[vagrant@localhost example]$ git pull

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 7, done.

remote: Counting objects: 100% (7/7), done.

remote: Compressing objects: 100% (3/3), done.

Unpacking objects: 100% (5/5), done.

remote: Total 5 (delta 1), reused 5 (delta 1), pack-reused 0

From github.com:taustation/example

f515a8a..30dc643 main -> origin/main

Updating f515a8a..30dc643

Fast-forward

user2.txt | 1 +

1 file changed, 1 insertion(+)

create mode 100644 user2.txt

user2のコミットも反映されている。

[vagrant@localhost example]$ ls
README.md  user1.txt  user2.txt
[vagrant@localhost example]$ cat user2.txt
user2による新規追加

[vagrant@localhost example]$ ls

README.md user1.txt user2.txt

[vagrant@localhost example]$ cat user2.txt

user2による新規追加

ログも最終状態になっている。

[vagrant@localhost example]$ git log
commit 30dc6433f7e4519d8a4c4ff9288812aed1d9bba9 (HEAD -> main, origin/main, origin/HEAD)
Merge: 8ead5ca f515a8a
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:48:22 2021 +0900

    Merge branch 'main' of github.com:taustation/example into main
    merging user1's work by user2

commit 8ead5caf0200c88e2b6fa70ddc2ff9d97d535da8
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:33:29 2021 +0900

    created user2.txt

commit f515a8ade4ea3d225cff1dd374895acf313ceca1
Author: taustation <taustation@gmail.com>
Date:   Fri Aug 13 09:31:33 2021 +0900

    created user1.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Fri Aug 13 09:20:42 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 30dc6433f7e4519d8a4c4ff9288812aed1d9bba9 (HEAD -> main, origin/main, origin/HEAD)

Merge: 8ead5ca f515a8a

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:48:22 2021 +0900

Merge branch 'main' of github.com:taustation/example into main

merging user1's work by user2

commit 8ead5caf0200c88e2b6fa70ddc2ff9d97d535da8

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:33:29 2021 +0900

created user2.txt

commit f515a8ade4ea3d225cff1dd374895acf313ceca1

Author: taustation <taustation@gmail.com>

Date: Fri Aug 13 09:31:33 2021 +0900

created user1.txt

commit 2a3e7602dcfe8f83868eb3d85556786de571b043

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Fri Aug 13 09:20:42 2021 +0900

Initial commit

Git – リモート – clone/push/pull/fetch

2021-08-13 / tau / コメントする

clone～リモートリポジトリーをローカルに複製

コマンド形式

git cloneはリモートリポジトリーの複製をローカルリポジトリーとして作成する。パスワード認証、SSH認証に対するコマンド形式は以下の通り。

パスワード認証

git clone https://github.com/account/remote_rep [local_rep]
SSH認証: git clone git@github.com:account/remote_rep.git [local_rep]

local_repを省略するとremote_repと同じ名前でディレクトリーが作成され、ローカルリポジトリーに設定される
パスワード認証はログインパスワードが非推奨になり、2段階認証化が必要
SSH認証の場合は別途キーセットの生成・登録などが必要

実行例

あらかじめリモートリポジトリーexampleを作成しておく
user1ディレクトリーを作成し、そこにexampleリポジトリーをクローン

[vagrant@localhost git]$ mkdir user1 && cd user1
[vagrant@localhost user1]$ git clone git@github.com:taustation/example.git
Cloning into 'example'...
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
Receiving objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
[vagrant@localhost user1]$ cd example/
[vagrant@localhost example]$ ls
README.md

[vagrant@localhost git]$ mkdir user1 && cd user1

[vagrant@localhost user1]$ git clone git@github.com:taustation/example.git

Cloning into 'example'...

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 3, done.

remote: Counting objects: 100% (3/3), done.

Receiving objects: 100% (3/3), done.

remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0

[vagrant@localhost user1]$ cd example/

[vagrant@localhost example]$ ls

README.md

push～ローカルのコミットをリモートに反映

コマンド形式

ローカルリポジトリー内でgit pushを実行すると、ローカルでのコミットをリモートに反映

git push

実行例

user1でcloneしたローカルリポジトリーのでファイルを作成・コミット。

vagrant@localhost example]$ vi user1.txt
[vagrant@localhost example]$ cat user1.txt
user1による新規作成
[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit -m "create user1.txt"
[main b26165d] create user1.txt
 1 file changed, 1 insertion(+)
 create mode 100644 user1.txt

vagrant@localhost example]$ vi user1.txt

[vagrant@localhost example]$ cat user1.txt

user1による新規作成

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit -m "create user1.txt"

[main b26165d] create user1.txt

1 file changed, 1 insertion(+)

create mode 100644 user1.txt

コミット結果のログ。

[vagrant@localhost example]$ git log
commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80 (HEAD -> main, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:36:03 2021 +0900

    create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Thu Aug 12 21:52:05 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80 (HEAD -> main, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:36:03 2021 +0900

create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Thu Aug 12 21:52:05 2021 +0900

Initial commit

コミット結果をリモートにプッシュ。

[vagrant@localhost example]$ git push
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 303 bytes | 303.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:taustation/example.git
   5449e2a..b26165d  main -> main

[vagrant@localhost example]$ git push

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

Enumerating objects: 4, done.

Counting objects: 100% (4/4), done.

Compressing objects: 100% (2/2), done.

Writing objects: 100% (3/3), 303 bytes | 303.00 KiB/s, done.

Total 3 (delta 0), reused 0 (delta 0)

To github.com:taustation/example.git

5449e2a..b26165d main -> main

GitHub上で作成されたファイルが確認できる。

cloneはその時点でのリモート内容を複製

user2ディレクトリーを作成してexampleをクローン。

[vagrant@localhost git]$ mkdir user2 && cd user2
[vagrant@localhost user2]$ git clone git@github.com:taustation/example.git
Cloning into 'example'...
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 6, done.
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 6 (delta 0), reused 3 (delta 0), pack-reused 0
Receiving objects: 100% (6/6), done.
[vagrant@localhost user2]$ cd example/

[vagrant@localhost git]$ mkdir user2 && cd user2

[vagrant@localhost user2]$ git clone git@github.com:taustation/example.git

Cloning into 'example'...

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 6, done.

remote: Counting objects: 100% (6/6), done.

remote: Compressing objects: 100% (3/3), done.

remote: Total 6 (delta 0), reused 3 (delta 0), pack-reused 0

Receiving objects: 100% (6/6), done.

[vagrant@localhost user2]$ cd example/

user1が作成したファイルが反映される。

[vagrant@localhost example]$ ls
README.md  user1.txt
[vagrant@localhost example]$ cat user1.txt
user1による新規作成

[vagrant@localhost example]$ ls

README.md user1.txt

[vagrant@localhost example]$ cat user1.txt

user1による新規作成

リモートへのpushはfast-forward

user2ファイル作成・コミット。

[vagrant@localhost example]$ vi user2.txt
[vagrant@localhost example]$ cat user2.txt
user2による新規作成
[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit -m "create user2.txt"
[main 5efce34] create user2.txt
 1 file changed, 1 insertion(+)
 create mode 100644 user2.txt

[vagrant@localhost example]$ vi user2.txt

[vagrant@localhost example]$ cat user2.txt

user2による新規作成

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit -m "create user2.txt"

[main 5efce34] create user2.txt

1 file changed, 1 insertion(+)

create mode 100644 user2.txt

コミット結果のログ。

[vagrant@localhost example]$ git log
commit 5efce34d814bce68977ed1bc0c4d1e66045837f1 (HEAD -> main, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:40:12 2021 +0900

    create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:36:03 2021 +0900

    create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Thu Aug 12 21:52:05 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 5efce34d814bce68977ed1bc0c4d1e66045837f1 (HEAD -> main, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:40:12 2021 +0900

create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:36:03 2021 +0900

create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Thu Aug 12 21:52:05 2021 +0900

Initial commit

user2のコミット結果をプッシュ。リモート上でfast-forwardでマージされる。この間にリモートで他のコミットが行われているとpushできない。

[vagrant@localhost example]$ git push
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 331 bytes | 331.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:taustation/example.git
   b26165d..5efce34  main -> main

[vagrant@localhost example]$ git push

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

Enumerating objects: 4, done.

Counting objects: 100% (4/4), done.

Compressing objects: 100% (2/2), done.

Writing objects: 100% (3/3), 331 bytes | 331.00 KiB/s, done.

Total 3 (delta 0), reused 0 (delta 0)

To github.com:taustation/example.git

b26165d..5efce34 main -> main

リモートリポジトリーからのpull

user1でリモートのexampleをプル。リモートの内容がfast-forwardでローカルリポジトリーにマージされる。

[vagrant@localhost example]$ git pull
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From github.com:taustation/example
   b26165d..5efce34  main       -> origin/main
Updating b26165d..5efce34
Fast-forward
 user2.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 user2.txt

[vagrant@localhost example]$ git pull

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 4, done.

remote: Counting objects: 100% (4/4), done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0

Unpacking objects: 100% (3/3), done.

From github.com:taustation/example

b26165d..5efce34 main -> origin/main

Updating b26165d..5efce34

Fast-forward

user2.txt | 1 +

1 file changed, 1 insertion(+)

create mode 100644 user2.txt

この時点までの変更(user2でのファイル作成)が反映されている。

[vagrant@localhost example]$ ls
README.md  user1.txt  user2.txt
[vagrant@localhost example]$ cat user2.txt
user2による新規作成

[vagrant@localhost example]$ ls

README.md user1.txt user2.txt

[vagrant@localhost example]$ cat user2.txt

user2による新規作成

ログも最新状態になる。

[vagrant@localhost example]$ git log
commit 5efce34d814bce68977ed1bc0c4d1e66045837f1 (HEAD -> main, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:40:12 2021 +0900

    create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:36:03 2021 +0900

    create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Thu Aug 12 21:52:05 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 5efce34d814bce68977ed1bc0c4d1e66045837f1 (HEAD -> main, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:40:12 2021 +0900

create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:36:03 2021 +0900

create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Thu Aug 12 21:52:05 2021 +0900

Initial commit

pullの後のコミットとpush

user1でファイルを変更、コミット。

[vagrant@localhost example]$ vi user1.txt
[vagrant@localhost example]$ cat user1.txt
user1による新規作成
user1による追加
[vagrant@localhost example]$ git add .
[vagrant@localhost example]$ git commit -m "modify user1.txt"
[main 2869489] modify user1.txt
 1 file changed, 1 insertion(+)

[vagrant@localhost example]$ vi user1.txt

[vagrant@localhost example]$ cat user1.txt

user1による新規作成

user1による追加

[vagrant@localhost example]$ git add .

[vagrant@localhost example]$ git commit -m "modify user1.txt"

[main 2869489] modify user1.txt

1 file changed, 1 insertion(+)

コミット後のログ。

commit 2869489cd881ae897558d89aa91b23419b7c33e4 (HEAD -> main, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:46:42 2021 +0900

    modify user1.txt

commit 5efce34d814bce68977ed1bc0c4d1e66045837f1
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:40:12 2021 +0900

    create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:36:03 2021 +0900

    create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Thu Aug 12 21:52:05 2021 +0900

    Initial commit

commit 2869489cd881ae897558d89aa91b23419b7c33e4 (HEAD -> main, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:46:42 2021 +0900

modify user1.txt

commit 5efce34d814bce68977ed1bc0c4d1e66045837f1

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:40:12 2021 +0900

create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:36:03 2021 +0900

create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Thu Aug 12 21:52:05 2021 +0900

Initial commit

user1のローカルリポジトリーからリモートにpush。

[vagrant@localhost example]$ git push
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 342 bytes | 342.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:taustation/example.git
   5efce34..2869489  main -> main

[vagrant@localhost example]$ git push

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

Enumerating objects: 5, done.

Counting objects: 100% (5/5), done.

Compressing objects: 100% (2/2), done.

Writing objects: 100% (3/3), 342 bytes | 342.00 KiB/s, done.

Total 3 (delta 0), reused 0 (delta 0)

To github.com:taustation/example.git

5efce34..2869489 main -> main

fetch～一時的なリモートの内容確認

フェッチの確認

user2でgit fetchを実行。

[vagrant@localhost example]$ git fetch
Enter passphrase for key '/home/vagrant/.ssh/id_rsa':
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From github.com:taustation/example
   5efce34..2869489  main       -> origin/main

[vagrant@localhost example]$ git fetch

Enter passphrase for key '/home/vagrant/.ssh/id_rsa':

remote: Enumerating objects: 5, done.

remote: Counting objects: 100% (5/5), done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0

Unpacking objects: 100% (3/3), done.

From github.com:taustation/example

5efce34..2869489 main -> origin/main

フェッチを実行した結果。

フェッチした場合はローカルリポジトリーにマージされず、FETCH_HEADブランチに複製される
FETCH_HEADは不可視でgit branchでは確認できないが、git checkoutで移動することができる
FETCH_HEADで変更・コミットした内容は最終的に破棄される
破棄したくない場合はgit switch -cで新たなブランチを作成できる
この操作はgit switch -cで取り消せる

[vagrant@localhost example]$ git checkout FETCH_HEAD
Note: switching to 'FETCH_HEAD'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 2869489 modify user1.txt

[vagrant@localhost example]$ git checkout FETCH_HEAD

Note: switching to 'FETCH_HEAD'.

You are in 'detached HEAD' state. You can look around, make experimental

changes and commit them, and you can discard any commits you make in this

state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may

do so (now or later) by using -c with the switch command. Example:

git switch -c <new-branch-name>

Or undo this operation with:

git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 2869489 modify user1.txt

FERCH_HEADブランチのログ。

[vagrant@localhost example]$ git log
commit 2869489cd881ae897558d89aa91b23419b7c33e4 (HEAD, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:46:42 2021 +0900

    modify user1.txt

commit 5efce34d814bce68977ed1bc0c4d1e66045837f1 (main)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:40:12 2021 +0900

    create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:36:03 2021 +0900

    create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Thu Aug 12 21:52:05 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 2869489cd881ae897558d89aa91b23419b7c33e4 (HEAD, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:46:42 2021 +0900

modify user1.txt

commit 5efce34d814bce68977ed1bc0c4d1e66045837f1 (main)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:40:12 2021 +0900

create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:36:03 2021 +0900

create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Thu Aug 12 21:52:05 2021 +0900

Initial commit

フェッチ内容の反映 = pull

FETCH_HEADがある状態でmainブランチに移動。

[vagrant@localhost example]$ git checkout main
Previous HEAD position was 2869489 modify user1.txt
Switched to branch 'main'
Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

[vagrant@localhost example]$ git checkout main

Previous HEAD position was 2869489 modify user1.txt

Switched to branch 'main'

Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.

(use "git pull" to update your local branch)

FETCH_HEADブランチをマージ。

[vagrant@localhost example]$ git merge FETCH_HEAD
Updating 5efce34..2869489
Fast-forward
 user1.txt | 1 +
 1 file changed, 1 insertion(+)

[vagrant@localhost example]$ git merge FETCH_HEAD

Updating 5efce34..2869489

Fast-forward

user1.txt | 1 +

1 file changed, 1 insertion(+)

FETCH_HEADで変更していなければ、結果は直接pullを実行したときと同じ。

[vagrant@localhost example]$ git log
commit 2869489cd881ae897558d89aa91b23419b7c33e4 (HEAD -> main, origin/main, origin/HEAD)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:46:42 2021 +0900

    modify user1.txt

commit 5efce34d814bce68977ed1bc0c4d1e66045837f1
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:40:12 2021 +0900

    create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 22:36:03 2021 +0900

    create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Thu Aug 12 21:52:05 2021 +0900

    Initial commit

[vagrant@localhost example]$ git log

commit 2869489cd881ae897558d89aa91b23419b7c33e4 (HEAD -> main, origin/main, origin/HEAD)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:46:42 2021 +0900

modify user1.txt

commit 5efce34d814bce68977ed1bc0c4d1e66045837f1

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:40:12 2021 +0900

create user2.txt

commit b26165d71c3748d673c1b0858c3f87ff9eb1cb80

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 22:36:03 2021 +0900

create user1.txt

commit 5449e2a9ddfcac864a647b1093894d33a741c57c

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Thu Aug 12 21:52:05 2021 +0900

Initial commit

Git – rebase – 競合あり

2021-08-12 / tau / コメントする

準備

Git – merge – no-fast-forward – 競合ありで準備したのと同じ内容でブランチとコミットを準備する。

mainブランチのファイル、ログの内容。

[vagrant@localhost branch]$ git checkout main
Switched to branch 'main'
Your branch is ahead of 'origin/main' by 3 commits.
  (use "git push" to publish your local commits)
[vagrant@localhost branch]$ cat common.txt
共通ファイル
mainブランチで新規作成->mainブランチで追加
mainブランチで1行追加
[vagrant@localhost branch]$ git log
commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:59 2021 +0900

    main2

commit 931848378d6d2594d868d92636f00a2a536a03d9
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:22:44 2021 +0900

    main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git checkout main

Switched to branch 'main'

Your branch is ahead of 'origin/main' by 3 commits.

(use "git push" to publish your local commits)

[vagrant@localhost branch]$ cat common.txt

共通ファイル

mainブランチで新規作成->mainブランチで追加

mainブランチで1行追加

[vagrant@localhost branch]$ git log

commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:59 2021 +0900

main2

commit 931848378d6d2594d868d92636f00a2a536a03d9

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:22:44 2021 +0900

main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

topicブランチのファイル、ログの内容。

[vagrant@localhost branch]$ git checkout topic
Switched to branch 'topic'
[vagrant@localhost branch]$ cat common.txt
共通ファイル
mainブランチで新規作成->topicブランチで追加
topicブランチで1行追加
[vagrant@localhost branch]$ git log
commit f64b41dc23038f579d6d4d0d7b93ef12061d2ed9 (HEAD -> topic)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:23 2021 +0900

    topic2

commit 349e514e0964d627b5acdf3df95e61db4dae1fe0
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:21:58 2021 +0900

    topic1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git checkout topic

Switched to branch 'topic'

[vagrant@localhost branch]$ cat common.txt

共通ファイル

mainブランチで新規作成->topicブランチで追加

topicブランチで1行追加

[vagrant@localhost branch]$ git log

commit f64b41dc23038f579d6d4d0d7b93ef12061d2ed9 (HEAD -> topic)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:23 2021 +0900

topic2

commit 349e514e0964d627b5acdf3df95e61db4dae1fe0

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:21:58 2021 +0900

topic1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

準備後の状態は以下の通り。

      initial commit    main0               main1               main2
<main>     ○──────○─────────△─────────▽ HEAD
           
<topic>                  ○────◇─────────□ HEAD
                        main0    topic1              topic2

initial commit main0 main1 main2

<main> ○──────○─────────△─────────▽ HEAD

<topic> ○────◇─────────□ HEAD

main0 topic1 topic2

rebase

リベースは、現在いるブランチの出発点を指定したブランチの末尾に変更する。ここではtopicブランチをmainブランチに繋げるため、topicブランチに移動する(あるいはtopicブランチにいることを確認する)。

[vagrant@localhost branch]$ git branch
  main
* topic

[vagrant@localhost branch]$ git branch

main

* topic

topicブランチでmainブランチを指定してgit rebaseを実行。common.txtで自動マージを実行しようとしたときに競合が発生している。

[vagrant@localhost branch]$ git rebase main
First, rewinding head to replay your work on top of it...
Applying: topic1
Using index info to reconstruct a base tree...
M       common.txt
Falling back to patching base and 3-way merge...
Auto-merging common.txt
CONFLICT (content): Merge conflict in common.txt
error: Failed to merge in the changes.
Patch failed at 0001 topic1
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".

[vagrant@localhost branch]$ git rebase main

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

Applying: topic1

Using index info to reconstruct a base tree...

M common.txt

Falling back to patching base and 3-way merge...

Auto-merging common.txt

CONFLICT (content): Merge conflict in common.txt

error: Failed to merge in the changes.

Patch failed at 0001 topic1

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".

common.txtの内容を確認してみると、マージの時と同じく競合部分の差分がマークされている。

[vagrant@localhost branch]$ cat common.txt
共通ファイル
<<<<<<< HEAD
mainブランチで新規作成->mainブランチで追加
mainブランチで1行追加
=======
mainブランチで新規作成
topicブランチで1行追加
>>>>>>> topic1
[vagrant@localhost branch]$

[vagrant@localhost branch]$ cat common.txt

共通ファイル

<<<<<<< HEAD

mainブランチで新規作成->mainブランチで追加

mainブランチで1行追加

=======

mainブランチで新規作成

topicブランチで1行追加

>>>>>>> topic1

[vagrant@localhost branch]$

ただし、マージで競合した場合(以下の内容)と違うところがある。

[vagrant@localhost branch]$ cat common.txt
共通ファイル
<<<<<<< HEAD
mainブランチで新規作成->mainブランチで追加
mainブランチで1行追加
=======
mainブランチで新規作成->topicブランチで追加
topicブランチで1行追加
>>>>>>> topic

[vagrant@localhost branch]$ cat common.txt

共通ファイル

<<<<<<< HEAD

mainブランチで新規作成->mainブランチで追加

mainブランチで1行追加

=======

mainブランチで新規作成->topicブランチで追加

topicブランチで1行追加

>>>>>>> topic

topicでログを見ると、ベース変更のためにmainブランチのコミットを適用したところで止まっている。

[vagrant@localhost branch]$ git log
commit d6f9ae35fb9abb8654d94ca01cce3da0e3a5c50f (HEAD, main)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 13:52:21 2021 +0900

    main2

commit c469b90838f45d3d5ee94351cba976111a332756
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 13:49:50 2021 +0900

    main1

commit 987a764f93cdcfdcde6f434ae888df8807136811
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 13:44:22 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git log

commit d6f9ae35fb9abb8654d94ca01cce3da0e3a5c50f (HEAD, main)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 13:52:21 2021 +0900

main2

commit c469b90838f45d3d5ee94351cba976111a332756

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 13:49:50 2021 +0900

main1

commit 987a764f93cdcfdcde6f434ae888df8807136811

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 13:44:22 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

abort

競合が発生したリベースを中止したい場合は、git rebase --abortを実行。

[vagrant@localhost branch]$ git rebase --abort

1	[vagrant@localhost branch]$ git rebase --abort

ログを確認すると、rebase実行前の状態に戻っている。

[vagrant@localhost branch]$ git log
commit c3435d8d143b90b700b8a3b5d9141bff6d8bd988 (HEAD -> topic)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 13:51:03 2021 +0900

    topic2

commit 2514a8f460ba7c7805ad89bc3e2d6b8ddc1c356a
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 13:49:08 2021 +0900

    topic1

commit 987a764f93cdcfdcde6f434ae888df8807136811
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 13:44:22 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git log

commit c3435d8d143b90b700b8a3b5d9141bff6d8bd988 (HEAD -> topic)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 13:51:03 2021 +0900

topic2

commit 2514a8f460ba7c7805ad89bc3e2d6b8ddc1c356a

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 13:49:08 2021 +0900

topic1

commit 987a764f93cdcfdcde6f434ae888df8807136811

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 13:44:22 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

競合の解消

再度リベースを試みる。

[vagrant@localhost branch]$ git rebase main
First, rewinding head to replay your work on top of it...
Applying: topic1
Using index info to reconstruct a base tree...
M       common.txt
Falling back to patching base and 3-way merge...
Auto-merging common.txt
CONFLICT (content): Merge conflict in common.txt
error: Failed to merge in the changes.
Patch failed at 0001 topic1
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".

[vagrant@localhost branch]$ git rebase main

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

Applying: topic1

Using index info to reconstruct a base tree...

M common.txt

Falling back to patching base and 3-way merge...

Auto-merging common.txt

CONFLICT (content): Merge conflict in common.txt

error: Failed to merge in the changes.

Patch failed at 0001 topic1

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".

競合しているcommon.txtのマークされた部分を修正。

[vagrant@localhost branch]$ vi common.txt
[vagrant@localhost branch]$ cat common.txt
共通ファイル
mainブランチで新規作成->mainブランチで追加(->topicブランチで追加)
mainブランチで1行追加
topicブランチで1行追加

[vagrant@localhost branch]$ vi common.txt

[vagrant@localhost branch]$ cat common.txt

共通ファイル

mainブランチで新規作成->mainブランチで追加(->topicブランチで追加)

mainブランチで1行追加

topicブランチで1行追加

競合解消後のリベースの手順は以下の通り

競合を解消したファイルをgit add
ここでコミットせずに、git rebase --continue

ところがまた競合が生じた。

[vagrant@localhost branch]$ git add .
[vagrant@localhost branch]$ git rebase --continue
Applying: topic1
Applying: topic2
Using index info to reconstruct a base tree...
M       common.txt
Falling back to patching base and 3-way merge...
Auto-merging common.txt
CONFLICT (content): Merge conflict in common.txt
error: Failed to merge in the changes.
Patch failed at 0002 topic2
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".

[vagrant@localhost branch]$ git add .

[vagrant@localhost branch]$ git rebase --continue

Applying: topic1

Applying: topic2

Using index info to reconstruct a base tree...

M common.txt

Falling back to patching base and 3-way merge...

Auto-merging common.txt

CONFLICT (content): Merge conflict in common.txt

error: Failed to merge in the changes.

Patch failed at 0002 topic2

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".

common.txtの内容。今度はtopicブランチでの追加結果が反映されていて、上で新たに修正した内容と食い違っていると言われている。

[vagrant@localhost branch]$ cat common.txt
共通ファイル
<<<<<<< HEAD
mainブランチで新規作成->mainブランチで追加(->topicブランチで追加)
mainブランチで1行追加
=======
mainブランチで新規作成->topicブランチで追加
>>>>>>> topic2
topicブランチで1行追加

[vagrant@localhost branch]$ cat common.txt

共通ファイル

<<<<<<< HEAD

mainブランチで新規作成->mainブランチで追加(->topicブランチで追加)

mainブランチで1行追加

=======

mainブランチで新規作成->topicブランチで追加

>>>>>>> topic2

topicブランチで1行追加

common.txtを修正。

[vagrant@localhost branch]$ vi common.txt
[vagrant@localhost branch]$ cat common.txt
共通ファイル
mainブランチで新規作成->mainブランチで追加->topicブランチで追加
mainブランチで1行追加
topicブランチで1行追加

[vagrant@localhost branch]$ vi common.txt

[vagrant@localhost branch]$ cat common.txt

共通ファイル

mainブランチで新規作成->mainブランチで追加->topicブランチで追加

mainブランチで1行追加

topicブランチで1行追加

git addしてgit rebase --continue。今度は最後まで通った。

[vagrant@localhost branch]$ git add .
[vagrant@localhost branch]$ git rebase --continue
Applying: topic2
[vagrant@localhost branch]$ cat common.txt
共通ファイル
mainブランチで新規作成->mainブランチで追加->topicブランチで追加
mainブランチで1行追加
topicブランチで1行追加

[vagrant@localhost branch]$ git add .

[vagrant@localhost branch]$ git rebase --continue

Applying: topic2

[vagrant@localhost branch]$ cat common.txt

共通ファイル

mainブランチで新規作成->mainブランチで追加->topicブランチで追加

mainブランチで1行追加

topicブランチで1行追加

リベース後のtopicブランチのログ。コミットが繋がっている。

[vagrant@localhost branch]$ git log --graph
* commit 092297fdd5479d8b5c0c86fa2355a24fc5a50a87 (HEAD -> topic)
| Author: taustation <taustation@gmail.com>
| Date:   Thu Aug 12 17:23:23 2021 +0900
|
|     topic2
|
* commit e239b666af29f2d3d793ee685948e6baad0f30bf
| Author: taustation <taustation@gmail.com>
| Date:   Thu Aug 12 17:21:58 2021 +0900
|
|     topic1
|
* commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (main)
| Author: taustation <taustation@gmail.com>
| Date:   Thu Aug 12 17:23:59 2021 +0900
|
|     main2
|
* commit 931848378d6d2594d868d92636f00a2a536a03d9
| Author: taustation <taustation@gmail.com>
| Date:   Thu Aug 12 17:22:44 2021 +0900
|
|     main1
|
* commit 24a6fdb19025eb52e229cb77bba90841917b2031
| Author: taustation <taustation@gmail.com>
| Date:   Thu Aug 12 17:20:48 2021 +0900
|
|     main0
|
* commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
  Author: taustation <88479749+taustation@users.noreply.github.com>
  Date:   Sun Aug 8 22:40:29 2021 +0900

      Initial commit

[vagrant@localhost branch]$ git log --graph

* commit 092297fdd5479d8b5c0c86fa2355a24fc5a50a87 (HEAD -> topic)

| Author: taustation <taustation@gmail.com>

| Date: Thu Aug 12 17:23:23 2021 +0900

| topic2

* commit e239b666af29f2d3d793ee685948e6baad0f30bf

| Author: taustation <taustation@gmail.com>

| Date: Thu Aug 12 17:21:58 2021 +0900

| topic1

* commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (main)

| Author: taustation <taustation@gmail.com>

| Date: Thu Aug 12 17:23:59 2021 +0900

| main2

* commit 931848378d6d2594d868d92636f00a2a536a03d9

| Author: taustation <taustation@gmail.com>

| Date: Thu Aug 12 17:22:44 2021 +0900

| main1

* commit 24a6fdb19025eb52e229cb77bba90841917b2031

| Author: taustation <taustation@gmail.com>

| Date: Thu Aug 12 17:20:48 2021 +0900

| main0

* commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

mainブランチの方は特に変更されていない。

[vagrant@localhost branch]$ git checkout main
Switched to branch 'main'
Your branch is ahead of 'origin/main' by 3 commits.
  (use "git push" to publish your local commits)
[vagrant@localhost branch]$ cat common.txt
共通ファイル
mainブランチで新規作成->mainブランチで追加
mainブランチで1行追加
[vagrant@localhost branch]$ git log
commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:59 2021 +0900

    main2

commit 931848378d6d2594d868d92636f00a2a536a03d9
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:22:44 2021 +0900

    main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git checkout main

Switched to branch 'main'

Your branch is ahead of 'origin/main' by 3 commits.

(use "git push" to publish your local commits)

[vagrant@localhost branch]$ cat common.txt

共通ファイル

mainブランチで新規作成->mainブランチで追加

mainブランチで1行追加

[vagrant@localhost branch]$ git log

commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:59 2021 +0900

main2

commit 931848378d6d2594d868d92636f00a2a536a03d9

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:22:44 2021 +0900

main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

リベース後の状態は以下のようになっている。

       initial commit    main0               main1               main2
<main>     ○──────○─────────△─────────▽ HEAD
           
<topic>    ○──────○─────────△─────────▽────◇────□ HEAD
                        main0               main1               main2    topic1    topic2

initial commit main0 main1 main2

<main> ○──────○─────────△─────────▽ HEAD

<topic> ○──────○─────────△─────────▽────◇────□ HEAD

main0 main1 main2 topic1 topic2

rebaseの撤回

リベースした後に取り消したい場合。git reflogで詳細なログを表示し、リベース開始直前の項目のログ番号を確認する。

[vagrant@localhost branch]$ git reflog
7940be5 (HEAD -> main) HEAD@{0}: checkout: moving from topic to main
092297f (topic) HEAD@{1}: rebase finished: returning to refs/heads/topic
092297f (topic) HEAD@{2}: rebase: topic2
e239b66 HEAD@{3}: rebase: topic1
7940be5 (HEAD -> main) HEAD@{4}: rebase: checkout main
f64b41d HEAD@{5}: checkout: moving from main to topic
.....

[vagrant@localhost branch]$ git reflog

7940be5 (HEAD -> main) HEAD@{0}: checkout: moving from topic to main

092297f (topic) HEAD@{1}: rebase finished: returning to refs/heads/topic

092297f (topic) HEAD@{2}: rebase: topic2

e239b66 HEAD@{3}: rebase: topic1

7940be5 (HEAD -> main) HEAD@{4}: rebase: checkout main

f64b41d HEAD@{5}: checkout: moving from main to topic

.....

rebaseを実行したブランチ(この場合はtopicブランチ)で以下を実行。間違ってmainブランチで実行すると、mainのコミット結果がtopic1、topic2で書き変わってしまう。

[vagrant@localhost branch]$ git checkout topic
Switched to branch 'topic'
[vagrant@localhost branch]$ git reset --hard HEAD@{5}
HEAD is now at 7940be5 main2

[vagrant@localhost branch]$ git checkout topic

Switched to branch 'topic'

[vagrant@localhost branch]$ git reset --hard HEAD@{5}

HEAD is now at 7940be5 main2

topicログの結果。リベース前に戻った。

[vagrant@localhost branch]$ git log
commit f64b41dc23038f579d6d4d0d7b93ef12061d2ed9 (HEAD -> topic)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:23 2021 +0900

    topic2

commit 349e514e0964d627b5acdf3df95e61db4dae1fe0
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:21:58 2021 +0900

    topic1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git log

commit f64b41dc23038f579d6d4d0d7b93ef12061d2ed9 (HEAD -> topic)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:23 2021 +0900

topic2

commit 349e514e0964d627b5acdf3df95e61db4dae1fe0

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:21:58 2021 +0900

topic1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

mainブランチは変更されていない。

[vagrant@localhost branch]$ git log
commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:59 2021 +0900

    main2

commit 931848378d6d2594d868d92636f00a2a536a03d9
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:22:44 2021 +0900

    main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git log

commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:59 2021 +0900

main2

commit 931848378d6d2594d868d92636f00a2a536a03d9

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:22:44 2021 +0900

main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

リベース結果のmainブランチへの反映

topicブランチでリベースを実行すると、その結果はtopicブランチでのものとなる。最終的にmainブランチにその結果を反映させたいときは、mainブランチに移動してそこでtopicブランチをマージする。

[vagrant@localhost branch]$ git merge topic
Updating 7940be5..092297f
Fast-forward
 common.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[vagrant@localhost branch]$ git merge topic

Updating 7940be5..092297f

Fast-forward

common.txt | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

mainブランチでコミットが行われていなければ、マージはfast-forwardで行われ、mainの内容がリベース後の結果まで送られる。

[vagrant@localhost branch]$ git log
commit 092297fdd5479d8b5c0c86fa2355a24fc5a50a87 (HEAD -> main, topic)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:23 2021 +0900

    topic2

commit e239b666af29f2d3d793ee685948e6baad0f30bf
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:21:58 2021 +0900

    topic1

commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:59 2021 +0900

    main2

commit 931848378d6d2594d868d92636f00a2a536a03d9
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:22:44 2021 +0900

    main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git log

commit 092297fdd5479d8b5c0c86fa2355a24fc5a50a87 (HEAD -> main, topic)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:23 2021 +0900

topic2

commit e239b666af29f2d3d793ee685948e6baad0f30bf

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:21:58 2021 +0900

topic1

commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:59 2021 +0900

main2

commit 931848378d6d2594d868d92636f00a2a536a03d9

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:22:44 2021 +0900

main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

作業結果も反映されている。

[vagrant@localhost branch]$ cat common.txt
共通ファイル
mainブランチで新規作成->mainブランチで追加->topicブランチで追加
mainブランチで1行追加
topicブランチで1行追加

[vagrant@localhost branch]$ cat common.txt

共通ファイル

mainブランチで新規作成->mainブランチで追加->topicブランチで追加

mainブランチで1行追加

topicブランチで1行追加

マージ・リベースの撤回

マージの撤回

まずマージを撤回する。git reflogでマージ直前のログ番号を確認。

[vagrant@localhost branch]$ git reflog
092297f (HEAD -> main, topic) HEAD@{0}: merge topic: Fast-forward
7940be5 HEAD@{1}: checkout: moving from topic to main
.....

[vagrant@localhost branch]$ git reflog

092297f (HEAD -> main, topic) HEAD@{0}: merge topic: Fast-forward

7940be5 HEAD@{1}: checkout: moving from topic to main

.....

確認したログ番号でgit reset。

[vagrant@localhost branch]$ git reset --hard HEAD@{3}
HEAD is now at 8cb6a80 main2

1 2	[vagrant@localhost branch]$ git reset --hard HEAD@{3} HEAD is now at 8cb6a80 main2

mainブランチの内容が元に戻る。

[vagrant@localhost branch]$ git log
commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (HEAD -> main)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:59 2021 +0900

    main2

commit 931848378d6d2594d868d92636f00a2a536a03d9
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:22:44 2021 +0900

    main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git log

commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (HEAD -> main)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:59 2021 +0900

main2

commit 931848378d6d2594d868d92636f00a2a536a03d9

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:22:44 2021 +0900

main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

topicブランチの内容はリベース直後の状態。

[vagrant@localhost branch]$ git log
commit 092297fdd5479d8b5c0c86fa2355a24fc5a50a87 (HEAD -> topic)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:23 2021 +0900

    topic2

commit e239b666af29f2d3d793ee685948e6baad0f30bf
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:21:58 2021 +0900

    topic1

commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (main)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:59 2021 +0900

    main2

commit 931848378d6d2594d868d92636f00a2a536a03d9
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:22:44 2021 +0900

    main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git log

commit 092297fdd5479d8b5c0c86fa2355a24fc5a50a87 (HEAD -> topic)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:23 2021 +0900

topic2

commit e239b666af29f2d3d793ee685948e6baad0f30bf

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:21:58 2021 +0900

topic1

commit 7940be59370dfdbc9d2bdd1177967a3e5ac2a958 (main)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:59 2021 +0900

main2

commit 931848378d6d2594d868d92636f00a2a536a03d9

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:22:44 2021 +0900

main1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

リベースの撤回

先ほどのリベースの撤回と同じ手順。

[vagrant@localhost branch]$ git reflog
.....
092297f (HEAD -> topic) HEAD@{13}: rebase: topic2
e239b66 HEAD@{14}: rebase: topic1
7940be5 (main) HEAD@{15}: rebase: checkout main
f64b41d HEAD@{16}: checkout: moving from main to topic
.....

[vagrant@localhost branch]$ git reflog

.....

092297f (HEAD -> topic) HEAD@{13}: rebase: topic2

e239b66 HEAD@{14}: rebase: topic1

7940be5 (main) HEAD@{15}: rebase: checkout main

f64b41d HEAD@{16}: checkout: moving from main to topic

.....

ログ番号を指定してgit reset。

[vagrant@localhost branch]$ git reset --hard HEAD@{10}
HEAD is now at 20e6cf9 topic2

1 2	[vagrant@localhost branch]$ git reset --hard HEAD@{10} HEAD is now at 20e6cf9 topic2

topicブランチの内容が元に戻っている(mainブランチも)。

[vagrant@localhost branch]$ git log
commit f64b41dc23038f579d6d4d0d7b93ef12061d2ed9 (HEAD -> topic)
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:23:23 2021 +0900

    topic2

commit 349e514e0964d627b5acdf3df95e61db4dae1fe0
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:21:58 2021 +0900

    topic1

commit 24a6fdb19025eb52e229cb77bba90841917b2031
Author: taustation <taustation@gmail.com>
Date:   Thu Aug 12 17:20:48 2021 +0900

    main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)
Author: taustation <88479749+taustation@users.noreply.github.com>
Date:   Sun Aug 8 22:40:29 2021 +0900

    Initial commit

[vagrant@localhost branch]$ git log

commit f64b41dc23038f579d6d4d0d7b93ef12061d2ed9 (HEAD -> topic)

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:23:23 2021 +0900

topic2

commit 349e514e0964d627b5acdf3df95e61db4dae1fe0

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:21:58 2021 +0900

topic1

commit 24a6fdb19025eb52e229cb77bba90841917b2031

Author: taustation <taustation@gmail.com>

Date: Thu Aug 12 17:20:48 2021 +0900

main0

commit ad931b08026b6a1ba68350176ae892bcb115a23e (origin/main, origin/HEAD)

Author: taustation <88479749+taustation@users.noreply.github.com>

Date: Sun Aug 8 22:40:29 2021 +0900

Initial commit

概要

準備

2つのコミットの統合

rebaseコマンド

各コミットへの対応記述

コミットメッセージの編集

処理結果

3つ以上のコミットの統合

イニシャルコミットとの統合

リモートへの反映

概要

準備

マージ

マージの取り消し

概要

準備

cherry-pick実行

暫定的なcherry-pick

-nオプション

暫定cherry-pickの破棄

暫定cherry-pickのコミット

概要

準備

HEADからの相対位置でreset

resetの取り消し～ORIG_HEAD

コミットを絶対指定したreset

概要

準備

revert実行

revertのrevert

飛び越しはできない

1つずつ遡るのは可能

準備

軽量タグ(lightweight)

コミット

タグ付け～git tag ...

注釈付きタグ(annotated)

コミット

タグ付け～git tag -a ... -m ...

タグの一覧

タグ名のみ～git tag

注釈付き～git tag -n

タグの削除～git tag -d

過去のコミットへのタグ付け

タグの詳細表示～git show ...

リモートへの反映～git push --tags

概要

準備

直前のコミットのコメントを修正する

エディターでコメント修正

コマンドラインでコメント設定

直前のコミットに追加修正する

既存ファイルを修正～メッセージ変更なし

新たなファイルを追加～追加とメッセージ変更

概要

準備

リモートリポジトリーの準備

user1の作成とクローン

user1によるコミット・プッシュ

user2によるコミット・プッシュ・エラー

対応処理

フェッチ

マージ

プッシュ

リモートへの繁栄の確認

clone～リモートリポジトリーをローカルに複製

コマンド形式

実行例

push～ローカルのコミットをリモートに反映

コマンド形式

実行例

cloneはその時点でのリモート内容を複製

リモートへのpushはfast-forward

リモートリポジトリーからのpull

pullの後のコミットとpush

fetch～一時的なリモートの内容確認

フェッチの確認

フェッチ内容の反映 = pull

準備

rebase

タグ付け～`git tag ...`

タグ付け～`git tag -a ... -m ...`

タグ名のみ～`git tag`

注釈付き～`git tag -n`

タグの削除～`git tag -d`

タグの詳細表示～`git show ...`

リモートへの反映～`git push --tags`