質問編集履歴
3
追記
test
CHANGED
File without changes
|
test
CHANGED
@@ -85,3 +85,27 @@
|
|
85
85
|
|
86
86
|
|
87
87
|
```
|
88
|
+
|
89
|
+
```ここに言語を入力
|
90
|
+
|
91
|
+
XOXOnoair:app XOXO$ git checkout HEAD -f
|
92
|
+
|
93
|
+
Checking out files: 100% (609/609), done.
|
94
|
+
|
95
|
+
XOXOnoair:app XOXO$ git status
|
96
|
+
|
97
|
+
On branch master
|
98
|
+
|
99
|
+
Untracked files:
|
100
|
+
|
101
|
+
(use "git add <file>..." to include in what will be committed)
|
102
|
+
|
103
|
+
|
104
|
+
|
105
|
+
app/views/users/show.html.erb
|
106
|
+
|
107
|
+
|
108
|
+
|
109
|
+
nothing added to commit but untracked files present (use "git add" to track)
|
110
|
+
|
111
|
+
```
|
2
誤字
test
CHANGED
File without changes
|
test
CHANGED
@@ -76,7 +76,7 @@
|
|
76
76
|
|
77
77
|
app/assets/stylesheets/posts.scss
|
78
78
|
|
79
|
-
app/views/posts/index
|
79
|
+
app/views/posts/index.html.erb
|
80
80
|
|
81
81
|
Please commit your changes or stash them before you switch branches.
|
82
82
|
|
1
追記
test
CHANGED
File without changes
|
test
CHANGED
@@ -43,3 +43,45 @@
|
|
43
43
|
```
|
44
44
|
|
45
45
|
結果、全てのファイルがrmされました。
|
46
|
+
|
47
|
+
###追記
|
48
|
+
|
49
|
+
```ここに言語を入力
|
50
|
+
|
51
|
+
XOXOnoair:app XOXO$ git checkout HEAD
|
52
|
+
|
53
|
+
D .DS_Store
|
54
|
+
|
55
|
+
D .gitignore
|
56
|
+
|
57
|
+
D .ruby-version
|
58
|
+
|
59
|
+
D Gemfile
|
60
|
+
|
61
|
+
D Gemfile.lock
|
62
|
+
|
63
|
+
D README.md
|
64
|
+
|
65
|
+
D Rakefile
|
66
|
+
|
67
|
+
以下省略...
|
68
|
+
|
69
|
+
```
|
70
|
+
|
71
|
+
```ここに言語を入力
|
72
|
+
|
73
|
+
XOXOnoair:app XOXO$ git checkout HEAD^
|
74
|
+
|
75
|
+
error: Your local changes to the following files would be overwritten by checkout:
|
76
|
+
|
77
|
+
app/assets/stylesheets/posts.scss
|
78
|
+
|
79
|
+
app/views/posts/indexs.html.erb
|
80
|
+
|
81
|
+
Please commit your changes or stash them before you switch branches.
|
82
|
+
|
83
|
+
Aborting
|
84
|
+
|
85
|
+
|
86
|
+
|
87
|
+
```
|