-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathconsole_out.txt
243 lines (175 loc) · 5.62 KB
/
console_out.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
$ pwd
/Users/rcd
$ git clone https://github.com/duke-compsci308-fall2014/game
Cloning into 'game'...
Username for 'https://github.com': robertcduvall
Password for 'https://robertcduvall@github.com':
remote: Counting objects: 8, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 8 (delta 0), reused 3 (delta 0)
Unpacking objects: 100% (8/8), done.
Checking connectivity... done.
$ ls
Applications Documents Library Music Public
Desktop Downloads Movies Pictures game
$ cd game
$ ls
LICENSE README.md
$ ls -a
. .. .git .gitignore LICENSE README.md
$ ls .git
HEAD config hooks info objects refs
branches description index logs packed-refs
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
$ git pull
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From https://github.com/duke-compsci308-fall2014/game
bfe8233..e346e36 master -> origin/master
Updating bfe8233..e346e36
Fast-forward
README.md | 3 +++
1 file changed, 3 insertions(+)
$ cat README.md
game
====
First project for CompSci 308 Spring 2014
My game will be lame
$ cd ..
$ ls
Applications Documents Library Music Public
Desktop Downloads Movies Pictures game
$ git pull
fatal: Not a git repository (or any of the parent directories): .git
$ cd game
$ cd ../Documents/compsci308_2014fall/
$ cd tester/
$ ls -la
total 16
drwxr-xr-x 7 rcd staff 238 Aug 27 11:03 .
drwxr-xr-x 4 rcd staff 136 Aug 27 11:03 ..
-rw-r--r-- 1 rcd staff 295 Aug 27 11:03 .classpath
-rw-r--r-- 1 rcd staff 365 Aug 27 11:03 .project
drwxr-xr-x 3 rcd staff 102 Aug 27 11:03 .settings
drwxr-xr-x 3 rcd staff 102 Aug 27 11:04 bin
drwxr-xr-x 3 rcd staff 102 Aug 27 11:04 src
$ cd ..
$ ls
game tester
$ cd game
$ git pull
fatal: Not a git repository (or any of the parent directories): .git
$ ls -a
. .classpath .settings src
.. .project bin
$ cd ..
$ ls
tester
$ mv ~/game .
$ ls
game tester
$ cd game/
$ ls -la
total 24
drwxr-xr-x 6 rcd staff 204 Aug 27 14:15 .
drwxr-xr-x 5 rcd staff 170 Aug 27 14:19 ..
drwxr-xr-x 15 rcd staff 510 Aug 27 14:15 .git
-rw-r--r-- 1 rcd staff 87 Aug 27 14:10 .gitignore
-rw-r--r-- 1 rcd staff 1091 Aug 27 14:10 LICENSE
-rw-r--r-- 1 rcd staff 76 Aug 27 14:15 README.md
$ ls -la
total 40
drwxr-xr-x 10 rcd staff 340 Aug 27 14:20 .
drwxr-xr-x 5 rcd staff 170 Aug 27 14:19 ..
-rw-r--r-- 1 rcd staff 226 Aug 27 14:20 .classpath
drwxr-xr-x 15 rcd staff 510 Aug 27 14:15 .git
-rw-r--r-- 1 rcd staff 87 Aug 27 14:10 .gitignore
-rw-r--r-- 1 rcd staff 363 Aug 27 14:20 .project
-rw-r--r-- 1 rcd staff 1091 Aug 27 14:10 LICENSE
-rw-r--r-- 1 rcd staff 76 Aug 27 14:15 README.md
drwxr-xr-x 2 rcd staff 68 Aug 27 14:20 bin
drwxr-xr-x 2 rcd staff 68 Aug 27 14:20 src
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/
nothing added to commit but untracked files present (use "git add" to track)
$ ls src
game
$ ls src/game/
Blah.java
$ git add src/game/Blah.java
$ 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)
new file: src/game/Blah.java
$ git commit
[master 4743a88] Created my first class.
1 file changed, 5 insertions(+)
create mode 100644 src/game/Blah.java
$ vi README.md
$ 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: README.md
no changes added to commit (use "git add" and/or "git commit -a")
$ git add README.md
$ git commit -m "Avoided using vi"
[master b3a03e5] Avoided using vi
1 file changed, 1 insertion(+)
$ git push
warning: push.default is unset; its implicit value is changing in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the current behavior after the default changes, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
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: 10, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (8/8), 737 bytes | 0 bytes/s, done.
Total 8 (delta 2), reused 0 (delta 0)
To https://github.com/duke-compsci308-fall2014/game
e346e36..b3a03e5 master -> master
$ vi src/game/Blah.java
$ 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: src/game/Blah.java
no changes added to commit (use "git add" and/or "git commit -a")
$ ls *
LICENSE README.md
bin:
game
src:
game
$ ls .??*
.classpath .gitignore .project
.git:
COMMIT_EDITMSG ORIG_HEAD description info packed-refs
FETCH_HEAD branches hooks logs refs
HEAD config index objects
$ git add src/Blah.java