回答編集履歴
1
-m
answer
CHANGED
|
@@ -2,4 +2,47 @@
|
|
|
2
2
|
|
|
3
3
|
```
|
|
4
4
|
git revert <merge commitのcommit hash>
|
|
5
|
-
```
|
|
5
|
+
```
|
|
6
|
+
|
|
7
|
+
---
|
|
8
|
+
|
|
9
|
+
追記
|
|
10
|
+
|
|
11
|
+
よく考えたらmerge commitをrevertするので、`-m`の指定がいりますね。
|
|
12
|
+
|
|
13
|
+
```
|
|
14
|
+
$git log --oneline --graph
|
|
15
|
+
* 341f0a3 (HEAD -> master) Merge branch 'sub'
|
|
16
|
+
|\
|
|
17
|
+
| * 20402e5 (sub) aaa
|
|
18
|
+
* | 95da940 bbb
|
|
19
|
+
|/
|
|
20
|
+
* 5fd6fa2 init
|
|
21
|
+
|
|
22
|
+
$git revert 341f0a3
|
|
23
|
+
error: commit 341f0a3e4cd2cf429ebfba3a742543da629ae0c8 is a merge but no -m option was given.
|
|
24
|
+
fatal: revert failed
|
|
25
|
+
|
|
26
|
+
$git show 341f0a3
|
|
27
|
+
commit 341f0a3e4cd2cf429ebfba3a742543da629ae0c8 (HEAD -> master)
|
|
28
|
+
Merge: 95da940 20402e5
|
|
29
|
+
Author: yumetodo <yume-wikijp@live.jp>
|
|
30
|
+
Date: Sat Oct 31 18:02:14 2020 +0900
|
|
31
|
+
|
|
32
|
+
Merge branch 'sub'
|
|
33
|
+
|
|
34
|
+
diff --cc test.txt
|
|
35
|
+
index fde1698,3bd1f0e..a5e2a02
|
|
36
|
+
--- a/test.txt
|
|
37
|
+
+++ b/test.txt
|
|
38
|
+
@@@ -1,2 -1,2 +1,3 @@@
|
|
39
|
+
foo
|
|
40
|
+
+hoge
|
|
41
|
+
+ bar
|
|
42
|
+
|
|
43
|
+
$git revert -m 1 341f0a3
|
|
44
|
+
[master 2c49898] Revert "Merge branch 'sub'"
|
|
45
|
+
1 file changed, 1 deletion(-)
|
|
46
|
+
```
|
|
47
|
+
|
|
48
|
+
merge commitを`git show`したときに出る`Merge: 95da940 20402e5`のような部分で、`-m 1`なら`95da940`のほうが残すほう、`-m 2`なら`20402e5`のほうが残すほうですね。
|