-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgit_log.txt
297 lines (229 loc) · 9.05 KB
/
git_log.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
Previous HEAD position was 37258c4... uwaaaaaaa
HEAD is now at a6a2ff9... uwaaaaaaa2
zacky@pc MINGW64 ~/Documents/tutorial ((a6a2ff9...))
$ ls
pmob.txt
zacky@pc MINGW64 ~/Documents/tutorial ((a6a2ff9...))
$ cat pmob.txt
shamison
$ git remote add origin https://github.com/jp-zacky/tutoreal.git
zacky@pc MINGW64 ~/Documents/tutorial ((a6a2ff9...))
$ git push -u origin master
Counting objects: 6, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (6/6), 432 bytes | 0 bytes/s, done.
Total 6 (delta 0), reused 0 (delta 0)
To https://github.com/jp-zacky/tutoreal.git
* [new branch] master -> master
Branch master set up to track remote branch master from origin.
zacky@pc MINGW64 ~/Documents/tutorial ((a6a2ff9...))
$ git add key.txt
zacky@pc MINGW64 ~/Documents/tutorial ((a6a2ff9...))
$ ls -a
./ ../ .git/ key.txt pmob.txt
zacky@pc MINGW64 ~/Documents/tutorial ((a6a2ff9...))
$ notepad .gitignore
dos2unix: .gitignore MODE 0100644 (regular file)
dos2unix: using ./d2utmpI3b9Y2 as temporary file
dos2unix: converting file .gitignore to Unix format...
zacky@pc MINGW64 ~/Documents/tutorial ((a6a2ff9...))
$ git add .gitignore key.txt
zacky@pc MINGW64 ~/Documents/tutorial ((a6a2ff9...))
$ git commit -m "gitgnore"
[detached HEAD 398484d] gitgnore
2 files changed, 2 insertions(+)
create mode 100644 .gitignore
create mode 100644 key.txt
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$ git push
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
fatal: You are not currently on a branch.
To push the history leading to the current (detached HEAD)
state now, use
git push origin HEAD:<name-of-remote-branch>
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$ git statuss
git: 'statuss' is not a git command. See 'git --help'.
Did you mean this?
status
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$ git status
HEAD detached from a6a2ff9
nothing to commit, working directory clean
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$ git remote -v
origin https://github.com/jp-zacky/tutoreal.git (fetch)
origin https://github.com/jp-zacky/tutoreal.git (push)
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$ git branch -v
* (HEAD detached from a6a2ff9) 398484d gitgnore
master a6a2ff9 uwaaaaaaa2
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$ git push origin 398484d:master
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (4/4), 320 bytes | 0 bytes/s, done.
Total 4 (delta 0), reused 0 (delta 0)
To https://github.com/jp-zacky/tutoreal.git
a6a2ff9..398484d 398484d -> master
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$ git checkout master
HEAD master origin/master
zacky@pc MINGW64 ~/Documents/tutorial ((398484d...))
$ git checkout master
Previous HEAD position was 398484d... gitgnore
Switched to branch 'master'
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git remote -v
origin https://github.com/jp-zacky/tutoreal.git (fetch)
origin https://github.com/jp-zacky/tutoreal.git (push)
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git pull
Updating a6a2ff9..398484d
Fast-forward
.gitignore | 1 +
key.txt | 1 +
2 files changed, 2 insertions(+)
create mode 100644 .gitignore
create mode 100644 key.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ ls
key.txt pmob.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ ls -a
./ ../ .git/ .gitignore key.txt pmob.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ cat .gitignore
key.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ vi key.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: key.txt
no changes added to commit (use "git add" and/or "git commit -a")
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git rm --cached key.txt
rm 'key.txt'
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ ls
key.txt pmob.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
deleted: key.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git commit -m 'foo'
[master d6120da] foo
1 file changed, 1 deletion(-)
delete mode 100644 key.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ ls
key.txt pmob.txt
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working directory clean
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ vi .gitignore
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: .gitignore
Untracked files:
(use "git add <file>..." to include in what will be committed)
key.txt
no changes added to commit (use "git add" and/or "git commit -a")
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ vi .gitignore
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: .gitignore
no changes added to commit (use "git add" and/or "git commit -a")
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git commit -m 'cashed'
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Changes not staged for commit:
modified: .gitignore
no changes added to commit
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git add .gitignore
warning: LF will be replaced by CRLF in .gitignore.
The file will have its original line endings in your working directory.
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git commit -m 'cashed'
[master warning: LF will be replaced by CRLF in .gitignore.
The file will have its original line endings in your working directory.
1d37296] cashed
warning: LF will be replaced by CRLF in .gitignore.
The file will have its original line endings in your working directory.
1 file changed, 1 insertion(+), 1 deletion(-)
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ git push
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (5/5), 505 bytes | 0 bytes/s, done.
Total 5 (delta 0), reused 0 (delta 0)
To https://github.com/jp-zacky/tutoreal.git
398484d..1d37296 master -> master
zacky@pc MINGW64 ~/Documents/tutorial (master)
$ emacs
bash: emacs: command not found
zacky@pc MINGW64 ~/Documents/tutorial (master)
$