githello/.bash_history at main · SJ01-max/githello · GitHub

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
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
clear
pwd
git clone
git clone https://github.com/SJ01-max/hello-git.git hello-git-cloned
la -l
ls -al
sudo yum install git
git --version
sudo yum install java-17-amazon-corretto-devel
java --version
cd
pwd
vi .vimrc
pwd
vi .bashrc
source .bashrc
clear
pwd
git conifg --global user.name "Sungjae Heo"
git config --global user.name "Sungjae Heo"
git config --global user.email "2071336@hansung.ac.kr"
git config --list
mkdir hello-git
cd hello-git/
vi Hello.java
cat Hello.java
javac Hello.java
java Hello
vi Hello.java
javac Hello.java
java Hello
vi README.md
ls -al
git init
ls -al
git status
git add README.MD
git add README.md
git add *.java
git status
git commit -m "C1: First Commit"
git status
git log
vi Hello.java
git status
git add Hello.java
git status
git commit -m "C2: Second Commit"
git status
git log
git log --oneline
git status
vi .gitignore
git status
git add .gitignore
git commit -m "C3: Added. gitignore
git commit -m "C3: Added. gitignore"
git log
clear
git log --oneline
git branch devel
git checkout devel
git log --oneline --graph
vi README.md
git status
git add README.md
git commit -m "C4: add bob's email"
git log --oneline
git checkout master
cat README.md
vi README.md
git commit -am "C5: add alice's email"
git log --oneline
git merge devel
git status
vi README.md
git add README.md
git commit -m "C6: conflict resolved"
git log --oneline --graph
clear
git checkout master
git remote -v
git remote add origin https://github.com/SJ01-max/hello-git.git
git remot -v
git remote -v
git push -u origin master
git config --global credential.helper store
git config --list

git push -u origin master
git push
git log --oneline
git tag -a v1.0.0 -m "first release" a306c50
git tag
git show v1.0.0
git push origin v1.0.0
git init
echo "A" >file.txt
git add file.txt
git commit -m "A"
echo "B" >> file.txt
git add file.txt
git commit -m "B"
echo "C" >> file.txt
git add file.txt
git commit -m "C"
git checkout -b cool-new-feature
echo "D" >> file.txt
git add file.txt
git commit -m "D"
echo "E" >> file.txt
git add file.txt
git commit -m "E"
echo "F" >> file.txt
git add file.txt
git commit -m "F"
git checkout main
git branch
git branch -M main
git checkout main
git checkout cool-new-feature
git checkout master
git init
git branch -M main
echo "A" > file.txt
git add file.txt
git commit -m "A"
echo "B" >> file.txt
git add file.txt
git commit -m "B"
echo "C" >> file.txt
git add file.txt
git commit -m "C"
git checkout -b cool-new-feature
echo "D" >> file.txt
git add file.txt
git commit -m "D"
echo "E" >> file.txt
git add file.txt
git commit -m "E"
echo "F" >> file.txt
git add file.txt
git commit -m "F"
git checkout main
echo "G" >> file.txt
git add file.txt
git commit -m "G"
git remote add origin https://github.com/SJ01-max/hello-git.git
git remote -v
git push -u origin main
git push -u origin cool-new-feature
git branch -D master
git branch
git branch -r
git push origin --delete master
rm -rf.git
git init
git remot add origin https://github.com/SJ01-max/hello-git.git
git branch -M main
echo "A" > file.txt
git add file.txt
git commit -m "A"
echo "B" >> file.txt
git add file.txt
git commit -m "B"
echo "C" >> file.txt
git add file.txt
git commit -m "C"
git checkout -b cool-new-feature
git branch -D cool-new-feature
git push origin --delete cool-new-feature
git checkout -b cool-new-feature
echo "D" >> file.txt
git add file.txt
git commit -m "D"
echo "E" >> file.txt
git add file.txt
git commit -m "E"
echo "F" >> file.txt
git add file.txt
git commit -m "F"
git checkout main
echo "G" >> file.txt
git add file.txt
git commit -m "G"
git push -u origin main
git push -u origin cool-new-feature
rm -rf .git
git init
git branch -r
git push origin --delete <branch-name>
git branch -r
git remote -v
git remote add origin https://github.com/SJ01-max/hello-git.git
git fetch
git branch -r
git push origin --delete main
git push origin --delete cool-new-feature
git push origin --delete master
git branch -r
git checkout -b main
git push -u origin main
git branch -r
git pull origin main --rebase
git push -u origin main
rm -rf .git
git init
git branch -M main
git remote add origin https://github.com/SJ01-max/hello-git.git
echo "A" > file.txt
git add file.txt
git commit -m "Initial commit: A"
git checkout -b cool-new-feature
echo "B" >> file.txt
git add file.txt
git commit -m "B"
echo "C" >> file.txt
git add file.txt
git commit -m "C"
git checkout main
echo "D" >> file.txt
git add file.txt
git commit -m "D"
git push -u origin main
git push -u origin cool-new-feature
git push origin --delete master
git pull origin main --rebase
git push -u origin main
git push origin --delete master
git pull origin main --rebase
git push -u origin main
git remote -v
git push -u origin main
git push origin --delete master
git branch -D master
git init
git branch -M main
echo "A" > file.txt
git add file.txt
git commit -m "A"
echo "B" >> file.txt
git add file.txt
git commit -m "B"
echo "C" >> file.txt
git add file.txt
git commit -m "C"
git checkout -b cool-new-feature
echo "D" >> file.txt
git add file.txt
git commit -m "D"
echo "E" >> file.txt
git add file.txt
git commit -m "E"
echo "F" >> file.txt
git add file.txt
git commit -m "F"
git checkout main
echo "G" >> file.txt
git add file.txt
git commit -m "G"
git push -u origin main
git push -u origin cool-new-feature
git checkout cool-new-feature
echo "D" >> file.txt
git add file.txt
git commit -m "D"
echo "E" >> file.txt
git add file.txt
git commit -m "E"
echo "F" >> file.txt
git add file.txt
git commit -m "F"
git push -u origin cool-new-feature
git checkout main
echo "G" >> file.txt
git add file.txt
git commit -m "G"
git push origin main
git branch -D cool-new-feature
git push origin --delete cool-new-feature
git checkout main
git checkout -b cool-new-feature
echo "D" >> file.txt
git add file.txt
git commit -m "D"
echo "E" >> file.txt
git add file.txt
git commit -m "E"
echo "F" >> file.txt
git add file.txt
git commit -m "F"
git push -u origin cool-new-feature
git checkout main
echo "G" >> file.txt
git add file.txt
git commit -m "G"
git push origin main
git checkout main
echo "G" >> file.txt
git add file.txt
git commit -m "G"
git push origin main
git log --oneline --graph
git reset --hard 697f70c
echo "G" >> file.txt
git add file.txt
git commit -m "G"
git branch -D cool-new-feature
git push origin --delete cool-new-feature
git checkout -b cool-new-feature
echo "D" >> file.txt
git add file.txt
git commit -m "D"
echo "D" >> file.txt
git add file.txt
git commit -m "D"
echo "E" >> file.txt
git add file.txt
git commit -m "E"
echo "E" >> file.txt
git add file.txt
git commit -m "E"
echo "F" >> file.txt
git add file.txt
git commit -m "F"
git push -u origin cool-new-feature
rm -rf .git
git init
git remote add origin https://github.com/SJ01-max/hello-git.git
git branch -M main
echo "A" >file.txt
git add file.txt
git commit -m "A"
echo "B" >> file.txt
git add file.txt
git commit -m "B"
echo "C" >> file.txt
git add file.txt
git commit -m "C"
git push -u origin main
git pull origin main --rebase
git push -u origin main
clear
git branch
dir
cd ..
dir
cd ..
dir
cd hw2repo
unzip hw2repo.zip
cd hw2repo
dir
scp -i "osskey.pem" hw2repo.zip ec2-user@ec2-54-91-201-151.compute-1.amazonaws.com:~/
ssh -i "osskey.pem" ec2-user@ec2-54-91-201-151.compute-1.amazonaws.com
ls
scp -i "osskey.pem" hw2repo.zip ec2-user@ec2-54-91-201-151.compute-1.amazonaws.com:~/
cd ..
dir
cd ..
dir
cd home
dir
cd ..
cd usr
dir
find / -name "osskey.pem"
scp -i /path/to/osskey.pem hw2repo.zip ec2-user@ec2-54-91-201-151.compute-1.amazonaws.com:~/
ssh -i /path/to/osskey.pem ec2-user@ec2-54-91-201-151.compute-1.amazonaws.com
ls
unzip hw2repo.zip
ls
cd hw2repo
git checkout master
git merge develop
nano program.c  # 또는 vim, vi 등 선호하는 텍스트 편집기 사용
git add program.c
git merge --continue
git status
git log --oneline --graph
mkdir git-project
cd git-project
git init
echo "This is commit 1" > file.txt
git add file.txt
git commit -m "Commit 1"
echo "This is commit 2" >> file.txt
git add file.txt
git commit -m "Commit 2"
echo "This is commit 3" >> file.txt
git add file.txt
git commit -m "Commit 3"
git remote add origin https://github.com/SJ01-max/git-project.git
git push -u origin master
git clone https://github.com/SJ01-max/git-project.git
cd git-project
git checkout -b feature
git reset --hard HEAD~1
echo "This is commit 4" >> file.txt
git add file.txt
git commit -m "Commit 4"
git push -u origin feature
git fetch origin
git checkout master
git pull origin feature
git merge feature
git push origin master
git log --oneline --graph -all
git log --oneline --graph --all
git log --oneline
git remote add origin https://github.com/SJ01-max/git-project.git
git push -u origin master
git branch
git remote -v
git push origin master --force
git log --oneline
git remote add origin https://github.com/SJ01-max/git-project.git
git remote set-url origin https://github.com/SJ01-max/git-project.git
git remote -v
git remote remove origin
git remote add origin https://github.com/SJ01-max/git-project.git
git remote -v
git pull origin master --allow-unrelated-histories
git push -u origin master
git clone https://github.com/SJ01-max/git-project.git
cd git-project
git checkout -b feature
git branch
git reset --hard HEAD~1
echo "This is commit 4" >> file.txt
git add file.txt
git commit -m "Commit 4"
git log --oneline
git push -u origin feature
git checkout master
git pull origin master
git log --oneline --graph --all
git checkout master
git pull origin feature
git merge feature
git log --oneline --graph --all
git push origin master
git log --oneline --graph --all
git add file.txt
git commit -m "Resolve conflict and merge feature into master"
git push origin master
git log --oneline --graph --all
git pull origin feature --rebase
git add .
git rebase --continue
git push -u origin feature --force
git log --oneline --graph --all
mkdir git-project2
cd git-project
git init
cd git-project2
cd ..
cd git-project2
git init
echo "This is commit 1" > file.txt
git add file.txt
git commit -m "Commit 1"
echo "This is commit 2" >> file.txt
git add file.txt
git commit -m "Commit 2"
echo "This is commit 3" >> file.txt
git add file.txt
git commit -m "Commit 3"
git remote add origin https://github.com/SJ01-max/git-project2.git
git push -u origin master
git clone https://github.com/SJ01-max/git-project2.git
cd git-project2
git checkout -b feature
git reset --hard HEAD~1
echo "This is commit 4" >> file.txt
git add file.txt
git commit -m "Commit 4"
git push -u origin feature
git fetch origin
git checkout master
git pull origin feature
git merge feature
git status
cat file.txt
nano file.txt
git add file.txt
git commit -m "Resolve conflict and merge feature into master"
git push origin master
git log --oneline --graph --all