API tools faq
paste
Advertisement
Guest User

git lesson 1 terminal output

a guest
May 5th, 2016
157
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 68.73 KB | None | 0 0
raw download clone embed print report
  1. [m@m-tower ~]$ git config --global push.default simple
  2. [m@m-tower ~]$ git config --list
  3. user.name=Marcu B.
  4. user.email=bzuzul13@gmail.com
  5. core.autocrlf=input
  6. push.default=simple
  7. [m@m-tower ~]$ git config --list
  8. user.name=Marcu B.
  9. user.email=bzuzul13@gmail.com
  10. core.autocrlf=input
  11. push.default=simple
  12. [m@m-tower ~]$ git config --global --list
  13. user.name=Marcu B.
  14. user.email=bzuzul13@gmail.com
  15. core.autocrlf=input
  16. push.default=simple
  17. [m@m-tower ~]$ ls
  18. Desktop Downloads Pictures Public Videos
  19. Documents Music 'PlayOnLinux'\''s virtual drives' Templates
  20. [m@m-tower ~]$ mkdir git play
  21. [m@m-tower ~]$ cd git play
  22. [m@m-tower git]$ ls
  23. [m@m-tower git]$ git init git-essentials
  24. Initialized empty Git repository in /home/m/git/git-essentials/.git/
  25. [m@m-tower git]$ cd git-essentials
  26. [m@m-tower git-essentials]$ ls -al
  27. total 12
  28. drwxr-xr-x 3 m m 4096 May 5 19:27 .
  29. drwxr-xr-x 3 m m 4096 May 5 19:27 ..
  30. drwxr-xr-x 7 m m 4096 May 5 19:27 .git
  31. [m@m-tower git-essentials]$ git status
  32. On branch master
  33.  
  34. Initial commit
  35.  
  36. nothing to commit (create/copy files and use "git add" to track)
  37. [m@m-tower git-essentials]$ touch README.md
  38. [m@m-tower git-essentials]$ echo " This is some stuff "
  39. This is some stuff
  40. [m@m-tower git-essentials]$ git status
  41. On branch master
  42.  
  43. Initial commit
  44.  
  45. Untracked files:
  46. (use "git add <file>..." to include in what will be committed)
  47.  
  48. README.md
  49.  
  50. nothing added to commit but untracked files present (use "git add" to track)
  51. [m@m-tower git-essentials]$ git add README.md
  52. [m@m-tower git-essentials]$ git status
  53. On branch master
  54.  
  55. Initial commit
  56.  
  57. Changes to be committed:
  58. (use "git rm --cached <file>..." to unstage)
  59.  
  60. new file: README.md
  61.  
  62. [m@m-tower git-essentials]$ git commit
  63. error: cannot run vi: No such file or directory
  64. error: unable to start editor 'vi'
  65. Please supply the message using either -m or -F option.
  66. [m@m-tower git-essentials]$ git commit -m "Initializing my repo with a README"
  67. [master (root-commit) 95c15d1] Initializing my repo with a README
  68. 1 file changed, 0 insertions(+), 0 deletions(-)
  69. create mode 100644 README.md
  70. [m@m-tower git-essentials]$ git status
  71. On branch master
  72. nothing to commit, working directory clean
  73. [m@m-tower git-essentials]$ git branch
  74. * master
  75. [m@m-tower git-essentials]$ git branch update-readme
  76. [m@m-tower git-essentials]$ git branch
  77. * master
  78. update-readme
  79. [m@m-tower git-essentials]$ git checkout update-readme
  80. Switched to branch 'update-readme'
  81. [m@m-tower git-essentials]$ git branch
  82. master
  83. * update-readme
  84. [m@m-tower git-essentials]$ git status
  85. On branch update-readme
  86. Changes not staged for commit:
  87. (use "git add <file>..." to update what will be committed)
  88. (use "git checkout -- <file>..." to discard changes in working directory)
  89.  
  90. modified: README.md
  91.  
  92. no changes added to commit (use "git add" and/or "git commit -a")
  93. [m@m-tower git-essentials]$ git add -A
  94. [m@m-tower git-essentials]$ git status
  95. On branch update-readme
  96. Changes to be committed:
  97. (use "git reset HEAD <file>..." to unstage)
  98.  
  99. modified: README.md
  100.  
  101. [m@m-tower git-essentials]$ git commit -m "Added stuf into the readme file"
  102. [update-readme 3ce53be] Added stuf into the readme file
  103. 1 file changed, 5 insertions(+)
  104. [m@m-tower git-essentials]$ git log
  105. commit 3ce53be6f8f94b1b4ebcd8a42b099a0b4c92fbe1
  106. Author: Marcu B <bzuzul13@gmail.com>
  107. Date: Thu May 5 19:49:12 2016 +0300
  108.  
  109. Added stuf into the readme file
  110.  
  111. commit 95c15d11d63f65c02c4f927320d9ae812eed9a3a
  112. Author: Marcu B <bzuzul13@gmail.com>
  113. Date: Thu May 5 19:35:09 2016 +0300
  114.  
  115. Initializing my repo with a README
  116. [m@m-tower git-essentials]$ git log
  117. commit 3ce53be6f8f94b1b4ebcd8a42b099a0b4c92fbe1
  118. Author: Marcu B <bzuzul13@gmail.com>
  119. Date: Thu May 5 19:49:12 2016 +0300
  120.  
  121. Added stuf into the readme file
  122.  
  123. commit 95c15d11d63f65c02c4f927320d9ae812eed9a3a
  124. Author: Marcu B <bzuzul13@gmail.com>
  125. Date: Thu May 5 19:35:09 2016 +0300
  126.  
  127. Initializing my repo with a README
  128. [m@m-tower git-essentials]$ git status
  129. On branch update-readme
  130. nothing to commit, working directory clean
  131. [m@m-tower git-essentials]$ git log --stat
  132. commit 3ce53be6f8f94b1b4ebcd8a42b099a0b4c92fbe1
  133. Author: Marcu B <bzuzul13@gmail.com>
  134. Date: Thu May 5 19:49:12 2016 +0300
  135.  
  136. Added stuf into the readme file
  137.  
  138. README.md | 5 +++++
  139. 1 file changed, 5 insertions(+)
  140.  
  141. commit 95c15d11d63f65c02c4f927320d9ae812eed9a3a
  142. Author: Marcu B <bzuzul13@gmail.com>
  143. Date: Thu May 5 19:35:09 2016 +0300
  144.  
  145. Initializing my repo with a README
  146.  
  147. README.md | 0
  148. 1 file changed, 0 insertions(+), 0 deletions(-)
  149. [m@m-tower git-essentials]$ git log --patch
  150. commit 3ce53be6f8f94b1b4ebcd8a42b099a0b4c92fbe1
  151. Author: Marcu B <bzuzul13@gmail.com>
  152. Date: Thu May 5 19:49:12 2016 +0300
  153.  
  154. Added stuf into the readme file
  155.  
  156. diff --git a/README.md b/README.md
  157. index e69de29..1944f95 100644
  158. --- a/README.md
  159. +++ b/README.md
  160. @@ -0,0 +1,5 @@
  161. +## GIT Essentials
  162. +
  163. +What I hope to learn
  164. +
  165. +- How to stuff git somthing
  166.  
  167. commit 95c15d11d63f65c02c4f927320d9ae812eed9a3a
  168. Author: Marcu B <bzuzul13@gmail.com>
  169. Date: Thu May 5 19:35:09 2016 +0300
  170.  
  171. Initializing my repo with a README
  172.  
  173. [m@m-tower git-essentials]$ git log --online
  174. fatal: unrecognized argument: --online
  175. [m@m-tower git-essentials]$ git log --oneline
  176. 3ce53be Added stuf into the readme file
  177. 95c15d1 Initializing my repo with a README
  178. [m@m-tower git-essentials]$ git log --oneline --graph
  179. * 3ce53be Added stuf into the readme file
  180. * 95c15d1 Initializing my repo with a README
  181. [m@m-tower git-essentials]$ git log --oneline --graph --decorate
  182. * 3ce53be (HEAD -> update-readme) Added stuf into the readme file
  183. * 95c15d1 (master) Initializing my repo with a README
  184. [m@m-tower git-essentials]$ git log --oneline --graph --decorate --all
  185. * 3ce53be (HEAD -> update-readme) Added stuf into the readme file
  186. * 95c15d1 (master) Initializing my repo with a README
  187. [m@m-tower git-essentials]$ git log --oneline --graph --decorate --all
  188. * 3ce53be (HEAD -> update-readme) Added stuf into the readme file
  189. * 95c15d1 (master) Initializing my repo with a README
  190. [m@m-tower git-essentials]$ git config --global alias.lol "log --oneline --graph --decorate --all
  191. > git config --global alias.lol "log --oneline --graph --decorate --all"
  192. > gir lol
  193. > got lol
  194. >
  195. > ^C
  196. [m@m-tower git-essentials]$
  197. [m@m-tower git-essentials]$ git lol
  198. git: 'lol' is not a git command. See 'git --help'.
  199.  
  200. Did you mean this?
  201. log
  202. [m@m-tower git-essentials]$ git log
  203. commit 3ce53be6f8f94b1b4ebcd8a42b099a0b4c92fbe1
  204. Author: Marcu B <bzuzul13@gmail.com>
  205. Date: Thu May 5 19:49:12 2016 +0300
  206.  
  207. Added stuf into the readme file
  208.  
  209. commit 95c15d11d63f65c02c4f927320d9ae812eed9a3a
  210. Author: Marcu B <bzuzul13@gmail.com>
  211. Date: Thu May 5 19:35:09 2016 +0300
  212.  
  213. Initializing my repo with a README
  214. [m@m-tower git-essentials]$ git config --global alias.lol "log --oneline --graph --decorate --all"
  215. [m@m-tower git-essentials]$ git lol
  216. * 3ce53be (HEAD -> update-readme) Added stuf into the readme file
  217. * 95c15d1 (master) Initializing my repo with a README
  218. [m@m-tower git-essentials]$ git checkout master
  219. Switched to branch 'master'
  220. [m@m-tower git-essentials]$ git branch
  221. * master
  222. update-readme
  223. [m@m-tower git-essentials]$ touch file1.md
  224. [m@m-tower git-essentials]$ git status
  225. On branch master
  226. Untracked files:
  227. (use "git add <file>..." to include in what will be committed)
  228.  
  229. file1.md
  230.  
  231. nothing added to commit but untracked files present (use "git add" to track)
  232. [m@m-tower git-essentials]$ git add file1.md
  233. [m@m-tower git-essentials]$ git sattus
  234. git: 'sattus' is not a git command. See 'git --help'.
  235.  
  236. Did you mean this?
  237. status
  238. [m@m-tower git-essentials]$ git status
  239. On branch master
  240. Changes to be committed:
  241. (use "git reset HEAD <file>..." to unstage)
  242.  
  243. new file: file1.md
  244.  
  245. [m@m-tower git-essentials]$ git commit -m" adding file 1"
  246. [master c3e7704] adding file 1
  247. 1 file changed, 0 insertions(+), 0 deletions(-)
  248. create mode 100644 file1.md
  249. [m@m-tower git-essentials]$ git lol
  250. * c3e7704 (HEAD -> master) adding file 1
  251. | * 3ce53be (update-readme) Added stuf into the readme file
  252. |/
  253. * 95c15d1 Initializing my repo with a README
  254. [m@m-tower git-essentials]$ git merge update-readme
  255. error: cannot run vi: No such file or directory
  256. error: unable to start editor 'vi'
  257. Not committing merge; use 'git commit' to complete the merge.
  258. [m@m-tower git-essentials]$ git merge update-readme -m "merged to here"
  259. fatal: You have not concluded your merge (MERGE_HEAD exists).
  260. Please, commit your changes before you merge.
  261. [m@m-tower git-essentials]$ git commit -m"added"
  262. [master cb693b7] added
  263. [m@m-tower git-essentials]$ git merge update-readme -m "merged to here"
  264. Already up-to-date.
  265. [m@m-tower git-essentials]$ git merge update-readme
  266. Already up-to-date.
  267. [m@m-tower git-essentials]$ git lol
  268. * cb693b7 (HEAD -> master) added
  269. |\
  270. | * 3ce53be (update-readme) Added stuf into the readme file
  271. * | c3e7704 adding file 1
  272. |/
  273. * 95c15d1 Initializing my repo with a README
  274. [m@m-tower git-essentials]$ git log
  275. commit cb693b76800ca596e464b5952daf5570b6ba7587
  276. Merge: c3e7704 3ce53be
  277. Author: Marcu B <bzuzul13@gmail.com>
  278. Date: Thu May 5 19:59:37 2016 +0300
  279.  
  280. added
  281.  
  282. commit c3e7704ab322746f0e9254d8a6a52f2069ad96aa
  283. Author: Marcu B <bzuzul13@gmail.com>
  284. Date: Thu May 5 19:56:14 2016 +0300
  285.  
  286. adding file 1
  287.  
  288. commit 3ce53be6f8f94b1b4ebcd8a42b099a0b4c92fbe1
  289. Author: Marcu B <bzuzul13@gmail.com>
  290. Date: Thu May 5 19:49:12 2016 +0300
  291.  
  292. Added stuf into the readme file
  293.  
  294. commit 95c15d11d63f65c02c4f927320d9ae812eed9a3a
  295. Author: Marcu B <bzuzul13@gmail.com>
  296. Date: Thu May 5 19:35:09 2016 +0300
  297.  
  298. [m@m-tower git-essentials]$ git lol
  299. * cb693b7 (HEAD -> master) added
  300. |\
  301. | * 3ce53be (update-readme) Added stuf into the readme file
  302. * | c3e7704 adding file 1
  303. |/
  304. * 95c15d1 Initializing my repo with a README
  305. [m@m-tower git-essentials]$ git lol
  306. * cb693b7 (HEAD -> master) added
  307. |\
  308. | * 3ce53be (update-readme) Added stuf into the readme file
  309. * | c3e7704 adding file 1
  310. |/
  311. * 95c15d1 Initializing my repo with a README
  312. [m@m-tower git-essentials]$ git checkout master
  313. Already on 'master'
  314. [m@m-tower git-essentials]$ git checkout master
  315. Already on 'master'
  316. [m@m-tower git-essentials]$ git checkout -b another-update
  317. Switched to a new branch 'another-update'
  318. [m@m-tower git-essentials]$ git lol
  319. * cb693b7 (HEAD -> another-update, master) added
  320. |\
  321. | * 3ce53be (update-readme) Added stuf into the readme file
  322. * | c3e7704 adding file 1
  323. |/
  324. * 95c15d1 Initializing my repo with a README
  325. [m@m-tower git-essentials]$ touch file2.md
  326. [m@m-tower git-essentials]$ git satus
  327. git: 'satus' is not a git command. See 'git --help'.
  328.  
  329. Did you mean this?
  330. status
  331. [m@m-tower git-essentials]$ git status
  332. On branch another-update
  333. Untracked files:
  334. (use "git add <file>..." to include in what will be committed)
  335.  
  336. file2.md
  337.  
  338. nothing added to commit but untracked files present (use "git add" to track)
  339. [m@m-tower git-essentials]$ git add file2.md
  340. [m@m-tower git-essentials]$ git commit -m "addind fil2"
  341. [another-update dd4d1b4] addind fil2
  342. 1 file changed, 0 insertions(+), 0 deletions(-)
  343. create mode 100644 file2.md
  344. [m@m-tower git-essentials]$ git lol
  345. * dd4d1b4 (HEAD -> another-update) addind fil2
  346. * cb693b7 (master) added
  347. |\
  348. | * 3ce53be (update-readme) Added stuf into the readme file
  349. * | c3e7704 adding file 1
  350. |/
  351. * 95c15d1 Initializing my repo with a README
  352. [m@m-tower git-essentials]$ git checkout master
  353. Switched to branch 'master'
  354. [m@m-tower git-essentials]$ git merge another-update
  355. Updating cb693b7..dd4d1b4
  356. Fast-forward
  357. file2.md | 0
  358. 1 file changed, 0 insertions(+), 0 deletions(-)
  359. create mode 100644 file2.md
  360. [m@m-tower git-essentials]$ git lol
  361. * dd4d1b4 (HEAD -> master, another-update) addind fil2
  362. * cb693b7 added
  363. |\
  364. | * 3ce53be (update-readme) Added stuf into the readme file
  365. * | c3e7704 adding file 1
  366. |/
  367. * 95c15d1 Initializing my repo with a README
  368. [m@m-tower git-essentials]$ git branch --merged
  369. another-update
  370. * master
  371. update-readme
  372. [m@m-tower git-essentials]$ git branch -d another-update update-readme
  373. Deleted branch another-update (was dd4d1b4).
  374. Deleted branch update-readme (was 3ce53be).
  375. [m@m-tower git-essentials]$ cd ..
  376. [m@m-tower git]$ ls
  377. git-essentials
  378. [m@m-tower git]$ git clone https://github.com/githubteacher/git-essentials-may-2016.git
  379. Cloning into 'git-essentials-may-2016'...
  380. remote: Counting objects: 10, done.
  381. remote: Compressing objects: 100% (7/7), done.
  382. remote: Total 10 (delta 2), reused 8 (delta 0), pack-reused 0
  383. Unpacking objects: 100% (10/10), done.
  384. Checking connectivity... done.
  385. [m@m-tower git]$ ls
  386. git-essentials git-essentials-may-2016
  387. [m@m-tower git]$ cd git-essentials-may-2016
  388. [m@m-tower git-essentials-may-2016]$ ls
  389. README.md
  390. [m@m-tower git-essentials-may-2016]$ git lol
  391. * cd2299b (HEAD -> master, origin/master, origin/HEAD) Filling in the README for the Git Essentials class
  392. * 8f4a1fb Merge pull request #2 from gitter-badger/gitter-badge
  393. |\
  394. | * 4d0c62f Add Gitter badge
  395. |/
  396. * 94c74ba Initial commit
  397. [m@m-tower git-essentials-may-2016]$ ls
  398. README.md
  399. [m@m-tower git-essentials-may-2016]$ ls -al
  400. total 16
  401. drwxr-xr-x 3 m m 4096 May 5 20:35 .
  402. drwxr-xr-x 4 m m 4096 May 5 20:35 ..
  403. drwxr-xr-x 8 m m 4096 May 5 20:35 .git
  404. -rw-r--r-- 1 m m 1086 May 5 20:35 README.md
  405. [m@m-tower git-essentials-may-2016]$ git lol
  406. * cd2299b (HEAD -> master, origin/master, origin/HEAD) Filling in the README for the Git Essentials class
  407. * 8f4a1fb Merge pull request #2 from gitter-badger/gitter-badge
  408. |\
  409. | * 4d0c62f Add Gitter badge
  410. |/
  411. * 94c74ba Initial commit
  412. [m@m-tower git-essentials-may-2016]$ git checkout -b bzuzul13-hometown
  413. Switched to a new branch 'bzuzul13-hometown'
  414. [m@m-tower git-essentials-may-2016]$ git branch
  415. * bzuzul13-hometown
  416. master
  417. [m@m-tower git-essentials-may-2016]$ git branch --all
  418. * bzuzul13-hometown
  419. master
  420. remotes/origin/HEAD -> origin/master
  421. remotes/origin/master
  422. [m@m-tower git-essentials-may-2016]$ git lol
  423. * cd2299b (HEAD -> bzuzul13-hometown, origin/master, origin/HEAD, master) Filling in the README for the Git Essentials class
  424. * 8f4a1fb Merge pull request #2 from gitter-badger/gitter-badge
  425. |\
  426. | * 4d0c62f Add Gitter badge
  427. |/
  428. * 94c74ba Initial commit
  429. [m@m-tower git-essentials-may-2016]$ touch bzuzul13-cluj.md
  430. [m@m-tower git-essentials-may-2016]$ atom .
  431. [m@m-tower git-essentials-may-2016]$ git status
  432. On branch bzuzul13-hometown
  433. Untracked files:
  434. (use "git add <file>..." to include in what will be committed)
  435.  
  436. bzuzul13-cluj.md
  437.  
  438. nothing added to commit but untracked files present (use "git add" to track)
  439. [m@m-tower git-essentials-may-2016]$ git add bzuzul13-cluj.md
  440. [m@m-tower git-essentials-may-2016]$ git add .
  441. [m@m-tower git-essentials-may-2016]$ git status
  442. On branch bzuzul13-hometown
  443. Changes to be committed:
  444. (use "git reset HEAD <file>..." to unstage)
  445.  
  446. new file: bzuzul13-cluj.md
  447.  
  448. [m@m-tower git-essentials-may-2016]$ git s
  449. git: 's' is not a git command. See 'git --help'.
  450.  
  451. Did you mean one of these?
  452. show
  453. status
  454. svn
  455. [m@m-tower git-essentials-may-2016]$ git status
  456. On branch bzuzul13-hometown
  457. Changes to be committed:
  458. (use "git reset HEAD <file>..." to unstage)
  459.  
  460. new file: bzuzul13-cluj.md
  461.  
  462. [m@m-tower git-essentials-may-2016]$ git commit -m "adding a stub of info to the file "
  463. [bzuzul13-hometown 143138d] adding a stub of info to the file
  464. 1 file changed, 5 insertions(+)
  465. create mode 100644 bzuzul13-cluj.md
  466. [m@m-tower git-essentials-may-2016]$ gi lol
  467. bash: gi: command not found
  468. [m@m-tower git-essentials-may-2016]$ git lol
  469. * 143138d (HEAD -> bzuzul13-hometown) adding a stub of info to the file
  470. * cd2299b (origin/master, origin/HEAD, master) Filling in the README for the Git Essentials class
  471. * 8f4a1fb Merge pull request #2 from gitter-badger/gitter-badge
  472. |\
  473. | * 4d0c62f Add Gitter badge
  474. |/
  475. * 94c74ba Initial commit
  476. [m@m-tower git-essentials-may-2016]$ git push -u origin bzuzul13-cluj
  477. error: src refspec bzuzul13-cluj does not match any.
  478. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  479. [m@m-tower git-essentials-may-2016]$ git push -u origin bzuzul13-cluj
  480. error: src refspec bzuzul13-cluj does not match any.
  481. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  482. [m@m-tower git-essentials-may-2016]$ git lol
  483. * 143138d (HEAD -> bzuzul13-hometown) adding a stub of info to the file
  484. * cd2299b (origin/master, origin/HEAD, master) Filling in the README for the Git Essentials class
  485. * 8f4a1fb Merge pull request #2 from gitter-badger/gitter-badge
  486. |\
  487. | * 4d0c62f Add Gitter badge
  488. |/
  489. * 94c74ba Initial commit
  490. [m@m-tower git-essentials-may-2016]$ git push -u origin bzuzul13-hometown
  491. Username for 'https://github.com': bzuzul13
  492. Password for 'https://bzuzul13@github.com':
  493. remote: Invalid username or password.
  494. fatal: Authentication failed for 'https://github.com/githubteacher/git-essentials-may-2016.git/'
  495. [m@m-tower git-essentials-may-2016]$ git push -u origin bzuzul13-hometown
  496. Username for 'https://github.com': bzuzul13
  497. Password for 'https://bzuzul13@github.com':
  498. Counting objects: 3, done.
  499. Delta compression using up to 2 threads.
  500. Compressing objects: 100% (3/3), done.
  501. Writing objects: 100% (3/3), 352 bytes | 0 bytes/s, done.
  502. Total 3 (delta 0), reused 0 (delta 0)
  503. To https://github.com/githubteacher/git-essentials-may-2016.git
  504. * [new branch] bzuzul13-hometown -> bzuzul13-hometown
  505. Branch bzuzul13-hometown set up to track remote branch bzuzul13-hometown from origin.
  506. [m@m-tower git-essentials-may-2016]$ git status
  507. On branch bzuzul13-hometown
  508. Your branch is up-to-date with 'origin/bzuzul13-hometown'.
  509. Changes not staged for commit:
  510. (use "git add <file>..." to update what will be committed)
  511. (use "git checkout -- <file>..." to discard changes in working directory)
  512.  
  513. modified: bzuzul13-cluj.md
  514.  
  515. no changes added to commit (use "git add" and/or "git commit -a")
  516. [m@m-tower git-essentials-may-2016]$ git add bzuzul13-cluj/md
  517. fatal: pathspec 'bzuzul13-cluj/md' did not match any files
  518. [m@m-tower git-essentials-may-2016]$ git add bzuzul13-cluj.md
  519. [m@m-tower git-essentials-may-2016]$ git commit -m " added places "
  520. [bzuzul13-hometown deab14e] added places
  521. 1 file changed, 2 insertions(+), 1 deletion(-)
  522. [m@m-tower git-essentials-may-2016]$ git status
  523. On branch bzuzul13-hometown
  524. Your branch is ahead of 'origin/bzuzul13-hometown' by 1 commit.
  525. (use "git push" to publish your local commits)
  526. nothing to commit, working directory clean
  527. [m@m-tower git-essentials-may-2016]$ git lol
  528. * deab14e (HEAD -> bzuzul13-hometown) added places
  529. * 143138d (origin/bzuzul13-hometown) adding a stub of info to the file
  530. * cd2299b (origin/master, origin/HEAD, master) Filling in the README for the Git Essentials class
  531. * 8f4a1fb Merge pull request #2 from gitter-badger/gitter-badge
  532. |\
  533. | * 4d0c62f Add Gitter badge
  534. |/
  535. * 94c74ba Initial commit
  536. [m@m-tower git-essentials-may-2016]$ git checkout master
  537. Switched to branch 'master'
  538. Your branch is up-to-date with 'origin/master'.
  539. [m@m-tower git-essentials-may-2016]$ git merge master bzuzul13-hometown
  540. Updating cd2299b..deab14e
  541. Fast-forward
  542. bzuzul13-cluj.md | 6 ++++++
  543. 1 file changed, 6 insertions(+)
  544. create mode 100644 bzuzul13-cluj.md
  545. [m@m-tower git-essentials-may-2016]$ git status
  546. On branch master
  547. Your branch is ahead of 'origin/master' by 2 commits.
  548. (use "git push" to publish your local commits)
  549. nothing to commit, working directory clean
  550. [m@m-tower git-essentials-may-2016]$ git push -u origin bzuzul13-hometown
  551. Username for 'https://github.com': bzuzul13
  552. Password for 'https://bzuzul13@github.com':
  553. Counting objects: 3, done.
  554. Delta compression using up to 2 threads.
  555. Compressing objects: 100% (3/3), done.
  556. Writing objects: 100% (3/3), 382 bytes | 0 bytes/s, done.
  557. Total 3 (delta 0), reused 0 (delta 0)
  558. To https://github.com/githubteacher/git-essentials-may-2016.git
  559. 143138d..deab14e bzuzul13-hometown -> bzuzul13-hometown
  560. Branch bzuzul13-hometown set up to track remote branch bzuzul13-hometown from origin.
  561. [m@m-tower git-essentials-may-2016]$ git status
  562. On branch master
  563. Your branch is ahead of 'origin/master' by 2 commits.
  564. (use "git push" to publish your local commits)
  565. nothing to commit, working directory clean
  566. [m@m-tower git-essentials-may-2016]$ git lol
  567. * deab14e (HEAD -> master, origin/bzuzul13-hometown, bzuzul13-hometown) added places
  568. * 143138d adding a stub of info to the file
  569. * cd2299b (origin/master, origin/HEAD) Filling in the README for the Git Essentials class
  570. * 8f4a1fb Merge pull request #2 from gitter-badger/gitter-badge
  571. |\
  572. | * 4d0c62f Add Gitter badge
  573. |/
  574. * 94c74ba Initial commit
  575. [m@m-tower git-essentials-may-2016]$ git checkout bzuzul13-hometown
  576. Switched to branch 'bzuzul13-hometown'
  577. Your branch is up-to-date with 'origin/bzuzul13-hometown'.
  578. [m@m-tower git-essentials-may-2016]$ git status
  579. On branch bzuzul13-hometown
  580. Your branch is up-to-date with 'origin/bzuzul13-hometown'.
  581. nothing to commit, working directory clean
  582. [m@m-tower git-essentials-may-2016]$ git checkout master
  583. Switched to branch 'master'
  584. Your branch is ahead of 'origin/master' by 2 commits.
  585. (use "git push" to publish your local commits)
  586. [m@m-tower git-essentials-may-2016]$ git checkout master
  587. Already on 'master'
  588. Your branch is ahead of 'origin/master' by 2 commits.
  589. (use "git push" to publish your local commits)
  590. [m@m-tower git-essentials-may-2016]$ git branch --all
  591. bzuzul13-hometown
  592. * master
  593. remotes/origin/HEAD -> origin/master
  594. remotes/origin/bzuzul13-hometown
  595. remotes/origin/master
  596. [m@m-tower git-essentials-may-2016]$ git fetch
  597. remote: Counting objects: 142, done.
  598. remote: Compressing objects: 100% (10/10), done.
  599. remote: Total 142 (delta 0), reused 0 (delta 0), pack-reused 131
  600. Receiving objects: 100% (142/142), 15.47 KiB | 0 bytes/s, done.
  601. Resolving deltas: 100% (1/1), done.
  602. From https://github.com/githubteacher/git-essentials-may-2016
  603. cd2299b..5b4658a master -> origin/master
  604. * [new branch] Igor-Champion-Belgrade -> origin/Igor-Champion-Belgrade
  605. * [new branch] LEDominator-hometown -> origin/LEDominator-hometown
  606. * [new branch] abengtson-hometown -> origin/abengtson-hometown
  607. * [new branch] adhorrig-hometown -> origin/adhorrig-hometown
  608. * [new branch] adowdle-hometown -> origin/adowdle-hometown
  609. * [new branch] akulbe-hometown -> origin/akulbe-hometown
  610. * [new branch] antoniomedrano-santabarbara -> origin/antoniomedrano-santabarbara
  611. * [new branch] bainbridgeisland-hometown -> origin/bainbridgeisland-hometown
  612. * [new branch] beardofedu-hometown -> origin/beardofedu-hometown
  613. * [new branch] butlerx-hometown -> origin/butlerx-hometown
  614. * [new branch] carbinemonoxide-hometown -> origin/carbinemonoxide-hometown
  615. * [new branch] cindyrains-hometown -> origin/cindyrains-hometown
  616. * [new branch] davedragon-hometown -> origin/davedragon-hometown
  617. * [new branch] davidpearson-hometown -> origin/davidpearson-hometown
  618. * [new branch] ebassias-hometown -> origin/ebassias-hometown
  619. * [new branch] etfernandes-hometown -> origin/etfernandes-hometown
  620. * [new branch] fabgonzalez-hometown -> origin/fabgonzalez-hometown
  621. * [new branch] futurepr0n-hometown -> origin/futurepr0n-hometown
  622. * [new branch] githubAlex-hometown -> origin/githubAlex-hometown
  623. * [new branch] githubteacher-hometown -> origin/githubteacher-hometown
  624. * [new branch] githubteacher-indpune -> origin/githubteacher-indpune
  625. * [new branch] githubteacher-irvine -> origin/githubteacher-irvine
  626. * [new branch] glennon-hometown -> origin/glennon-hometown
  627. * [new branch] hamid914-hometown -> origin/hamid914-hometown
  628. * [new branch] jeansbolong-hometown -> origin/jeansbolong-hometown
  629. * [new branch] jinnatan-gz -> origin/jinnatan-gz
  630. * [new branch] jkero98-hometown -> origin/jkero98-hometown
  631. * [new branch] jobyjoseph-hometown -> origin/jobyjoseph-hometown
  632. * [new branch] josephyli-hometown -> origin/josephyli-hometown
  633. * [new branch] jtfernandes-sky-hometown -> origin/jtfernandes-sky-hometown
  634. * [new branch] kartikijoshi-hometown -> origin/kartikijoshi-hometown
  635. * [new branch] kgodoy-irvine -> origin/kgodoy-irvine
  636. * [new branch] madepu81.sfo -> origin/madepu81.sfo
  637. * [new branch] manojdatar-hometown -> origin/manojdatar-hometown
  638. * [new branch] mvee-hometown -> origin/mvee-hometown
  639. * [new branch] mvnu-awillia2-hometown -> origin/mvnu-awillia2-hometown
  640. * [new branch] mvohlken-hometown -> origin/mvohlken-hometown
  641. * [new branch] nehakgoyal-hometown -> origin/nehakgoyal-hometown
  642. * [new branch] pramodr-hometown -> origin/pramodr-hometown
  643. * [new branch] qfilu-srinagar -> origin/qfilu-srinagar
  644. * [new branch] rayphelps42-hometown -> origin/rayphelps42-hometown
  645. * [new branch] robertwayne-hometown -> origin/robertwayne-hometown
  646. * [new branch] rrector-hometown -> origin/rrector-hometown
  647. * [new branch] rustinalexandru-hometown -> origin/rustinalexandru-hometown
  648. [m@m-tower git-essentials-may-2016]$ git branch --all
  649. bzuzul13-hometown
  650. * master
  651. remotes/origin/HEAD -> origin/master
  652. remotes/origin/Igor-Champion-Belgrade
  653. remotes/origin/LEDominator-hometown
  654. remotes/origin/abengtson-hometown
  655. remotes/origin/adhorrig-hometown
  656. remotes/origin/adowdle-hometown
  657. remotes/origin/akulbe-hometown
  658. remotes/origin/antoniomedrano-santabarbara
  659. remotes/origin/bainbridgeisland-hometown
  660. remotes/origin/beardofedu-hometown
  661. remotes/origin/butlerx-hometown
  662. remotes/origin/bzuzul13-hometown
  663. remotes/origin/carbinemonoxide-hometown
  664. remotes/origin/cindyrains-hometown
  665. remotes/origin/davedragon-hometown
  666. remotes/origin/davidpearson-hometown
  667. remotes/origin/ebassias-hometown
  668. remotes/origin/etfernandes-hometown
  669. remotes/origin/fabgonzalez-hometown
  670. remotes/origin/futurepr0n-hometown
  671. remotes/origin/githubAlex-hometown
  672. remotes/origin/githubteacher-hometown
  673. remotes/origin/githubteacher-indpune
  674. remotes/origin/githubteacher-irvine
  675. remotes/origin/glennon-hometown
  676. remotes/origin/hamid914-hometown
  677. remotes/origin/jeansbolong-hometown
  678. remotes/origin/jinnatan-gz
  679. remotes/origin/jkero98-hometown
  680. remotes/origin/jobyjoseph-hometown
  681. remotes/origin/josephyli-hometown
  682. remotes/origin/jtfernandes-sky-hometown
  683. remotes/origin/kartikijoshi-hometown
  684. remotes/origin/kgodoy-irvine
  685. remotes/origin/madepu81.sfo
  686. remotes/origin/manojdatar-hometown
  687. remotes/origin/master
  688. remotes/origin/mvee-hometown
  689. remotes/origin/mvnu-awillia2-hometown
  690. remotes/origin/mvohlken-hometown
  691. remotes/origin/nehakgoyal-hometown
  692. remotes/origin/pramodr-hometown
  693. remotes/origin/qfilu-srinagar
  694. remotes/origin/rayphelps42-hometown
  695. remotes/origin/robertwayne-hometown
  696. remotes/origin/rrector-hometown
  697. remotes/origin/rustinalexandru-hometown
  698. [m@m-tower git-essentials-may-2016]$ git log master..origin/master
  699. commit 5b4658ab0b025e7af831ae7fb596e9941779ea81
  700. Merge: 7089af0 22660d7
  701. Author: App to App ssh for iebuild <iebuild@sf1-1castro-ixb-ah.wellsfargo.com>
  702. Date: Thu May 5 10:59:55 2016 -0700
  703.  
  704. new changes
  705.  
  706. commit 22660d7ef27acd6e3256eb9f2b9118f6b004137f
  707. Author: Ke Ma <ke.ma@wearesuburb.com>
  708. Date: Thu May 5 18:56:13 2016 +0100
  709.  
  710. fix typo error
  711.  
  712. commit 161a75abe480d0a84894711cc52b513adb24c8b2
  713. Author: Ke Ma <ke.ma@wearesuburb.com>
  714. Date: Thu May 5 18:54:50 2016 +0100
  715.  
  716. my new file
  717.  
  718. commit 7089af0f7962c9b5fc11866539401ff5262278fd
  719. Author: App to App ssh for iebuild <iebuild@sf1-1castro-ixb-ah.wellsfargo.com>
  720. Date: Thu May 5 10:51:06 2016 -0700
  721.  
  722. adding newfile
  723. [m@m-tower git-essentials-may-2016]$ git log --oneline master..origin/master
  724. 5b4658a new changes
  725. 22660d7 fix typo error
  726. 161a75a my new file
  727. 7089af0 adding newfile
  728. [m@m-tower git-essentials-may-2016]$ got log --patch master..origin/master
  729. bash: got: command not found
  730. [m@m-tower git-essentials-may-2016]$ git log --patch master..origin/master
  731. commit 5b4658ab0b025e7af831ae7fb596e9941779ea81
  732. commit 5b4658ab0b025e7af831ae7fb596e9941779ea81
  733. Merge: 7089af0 22660d7
  734. Author: App to App ssh for iebuild <iebuild@sf1-1castro-ixb-ah.wellsfargo.com>
  735. Date: Thu May 5 10:59:55 2016 -0700
  736.  
  737. new changes
  738.  
  739. commit 22660d7ef27acd6e3256eb9f2b9118f6b004137f
  740. Author: Ke Ma <ke.ma@wearesuburb.com>
  741. Date: Thu May 5 18:56:13 2016 +0100
  742.  
  743. fix typo error
  744.  
  745. diff --git a/newfiel b/newfiel
  746.  
  747. new changes
  748.  
  749. commit 22660d7ef27acd6e3256eb9f2b9118f6b004137f
  750. Author: Ke Ma <ke.ma@wearesuburb.com>
  751. Date: Thu May 5 18:56:13 2016 +0100
  752.  
  753. fix typo error
  754.  
  755. diff --git a/newfiel b/newfiel
  756. deleted file mode 100644
  757. index fe82ccf..0000000
  758. --- a/newfiel
  759. +++ /dev/null
  760. @@ -1 +0,0 @@
  761. -super commands
  762. diff --git a/newfile b/newfile
  763. new file mode 100644
  764. new file mode 100644
  765. index 0000000..fe82ccf
  766. --- /dev/null
  767. +++ b/newfile
  768. @@ -0,0 +1 @@
  769. +super commands
  770.  
  771. commit 161a75abe480d0a84894711cc52b513adb24c8b2
  772. Author: Ke Ma <ke.ma@wearesuburb.com>
  773. Date: Thu May 5 18:54:50 2016 +0100
  774.  
  775. my new file
  776.  
  777. diff --git a/newfiel b/newfiel
  778. new file mode 100644
  779. index 0000000..fe82ccf
  780. --- /dev/null
  781. +++ b/newfiel
  782. @@ -0,0 +1 @@
  783. +super commands
  784.  
  785. commit 7089af0f7962c9b5fc11866539401ff5262278fd
  786. Author: App to App ssh for iebuild <iebuild@sf1-1castro-ixb-ah.wellsfargo.com>
  787. Date: Thu May 5 10:51:06 2016 -0700
  788.  
  789. adding newfile
  790.  
  791. diff --git a/newfile b/newfile
  792. new file mode 100644
  793. index 0000000..deba01f
  794. --- /dev/null
  795. +++ b/newfile
  796. @@ -0,0 +1 @@
  797. +something
  798. [m@m-tower git-essentials-may-2016]$ git merge origin/master
  799. Merge made by the 'recursive' strategy.
  800. newfile | 5 +++++
  801. 1 file changed, 5 insertions(+)
  802. create mode 100644 newfile
  803. [m@m-tower git-essentials-may-2016]$ git pull
  804. remote: Counting objects: 4, done.
  805. remote: Compressing objects: 100% (4/4), done.
  806. remote: Total 4 (delta 1), reused 0 (delta 0), pack-reused 0
  807. Unpacking objects: 100% (4/4), done.
  808. From https://github.com/githubteacher/git-essentials-may-2016
  809. * [new branch] mseim-seattle -> origin/mseim-seattle
  810. Already up-to-date.
  811. [m@m-tower git-essentials-may-2016]$ git branch --all
  812. bzuzul13-hometown
  813. * master
  814. remotes/origin/HEAD -> origin/master
  815. remotes/origin/Igor-Champion-Belgrade
  816. remotes/origin/LEDominator-hometown
  817. remotes/origin/abengtson-hometown
  818. remotes/origin/adhorrig-hometown
  819. remotes/origin/adowdle-hometown
  820. remotes/origin/akulbe-hometown
  821. remotes/origin/antoniomedrano-santabarbara
  822. remotes/origin/bainbridgeisland-hometown
  823. remotes/origin/beardofedu-hometown
  824. remotes/origin/butlerx-hometown
  825. remotes/origin/bzuzul13-hometown
  826. remotes/origin/carbinemonoxide-hometown
  827. remotes/origin/cindyrains-hometown
  828. remotes/origin/davedragon-hometown
  829. remotes/origin/davidpearson-hometown
  830. remotes/origin/ebassias-hometown
  831. remotes/origin/etfernandes-hometown
  832. remotes/origin/fabgonzalez-hometown
  833. remotes/origin/futurepr0n-hometown
  834. remotes/origin/githubAlex-hometown
  835. remotes/origin/githubteacher-hometown
  836. remotes/origin/githubteacher-indpune
  837. remotes/origin/githubteacher-irvine
  838. remotes/origin/glennon-hometown
  839. remotes/origin/hamid914-hometown
  840. remotes/origin/jeansbolong-hometown
  841. remotes/origin/jinnatan-gz
  842. remotes/origin/jkero98-hometown
  843. remotes/origin/jobyjoseph-hometown
  844. remotes/origin/josephyli-hometown
  845. remotes/origin/jtfernandes-sky-hometown
  846. remotes/origin/kartikijoshi-hometown
  847. remotes/origin/kgodoy-irvine
  848. remotes/origin/madepu81.sfo
  849. remotes/origin/manojdatar-hometown
  850. remotes/origin/master
  851. remotes/origin/mseim-seattle
  852. remotes/origin/mvee-hometown
  853. remotes/origin/mvnu-awillia2-hometown
  854. remotes/origin/mvohlken-hometown
  855. remotes/origin/nehakgoyal-hometown
  856. remotes/origin/pramodr-hometown
  857. remotes/origin/qfilu-srinagar
  858. remotes/origin/rayphelps42-hometown
  859. remotes/origin/robertwayne-hometown
  860. remotes/origin/rrector-hometown
  861. remotes/origin/rustinalexandru-hometown
  862. [m@m-tower git-essentials-may-2016]$ git checkout beardofedu-hometown
  863. Branch beardofedu-hometown set up to track remote branch beardofedu-hometown from origin.
  864. Switched to a new branch 'beardofedu-hometown'
  865. [m@m-tower git-essentials-may-2016]$ atom .
  866. [m@m-tower git-essentials-may-2016]$ git branch
  867. * beardofedu-hometown
  868. bzuzul13-hometown
  869. master
  870. [m@m-tower git-essentials-may-2016]$ git checkout bzuzul13-hometown
  871. Switched to branch 'bzuzul13-hometown'
  872. Your branch is up-to-date with 'origin/bzuzul13-hometown'.
  873. [m@m-tower git-essentials-may-2016]$ git status
  874. On branch bzuzul13-hometown
  875. Your branch is up-to-date with 'origin/bzuzul13-hometown'.
  876. nothing to commit, working directory clean
  877. [m@m-tower git-essentials-may-2016]$ atom .
  878. [m@m-tower git-essentials-may-2016]$ git status
  879. On branch bzuzul13-hometown
  880. Your branch is up-to-date with 'origin/bzuzul13-hometown'.
  881. Changes not staged for commit:
  882. (use "git add <file>..." to update what will be committed)
  883. (use "git checkout -- <file>..." to discard changes in working directory)
  884.  
  885. modified: bzuzul13-cluj.md
  886.  
  887. no changes added to commit (use "git add" and/or "git commit -a")
  888. [m@m-tower git-essentials-may-2016]$ git add .
  889. [m@m-tower git-essentials-may-2016]$ gitt add -p
  890. bash: gitt: command not found
  891. [m@m-tower git-essentials-may-2016]$ git add -p
  892. diff --git a/bzuzul13-cluj.md b/bzuzul13-cluj.md
  893. index 1890ee7..0df9c4f 100644
  894. --- a/bzuzul13-cluj.md
  895. +++ b/bzuzul13-cluj.md
  896. @@ -1,8 +1,9 @@
  897. ## Cluj-Napoca, Romania
  898. -
  899. ### Places to Eat
  900. Delissima Pizza
  901. Lots of Shaorma places
  902. ### Fun things to do
  903. Go to Cetatuie, great view of the city
  904. Run in the rain, we have good rain here :)
  905. +
  906. +Great config file :)
  907. Stage this hunk [y,n,q,a,d,/,s,e,?]? s
  908. Split into 2 hunks.
  909. @@ -1,8 +1,7 @@
  910. ## Cluj-Napoca, Romania
  911. -
  912. ### Places to Eat
  913. Delissima Pizza
  914. Lots of Shaorma places
  915. ### Fun things to do
  916. Go to Cetatuie, great view of the city
  917. Run in the rain, we have good rain here :)
  918. Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]? y
  919. @@ -3,6 +2,8 @@
  920. ### Places to Eat
  921. Delissima Pizza
  922. Lots of Shaorma places
  923. ### Fun things to do
  924. Go to Cetatuie, great view of the city
  925. Run in the rain, we have good rain here :)
  926. +
  927. +Great config file :)
  928. Stage this hunk [y,n,q,a,d,/,K,g,e,?]? u
  929. y - stage this hunk
  930. n - do not stage this hunk
  931. q - quit; do not stage this hunk or any of the remaining ones
  932. a - stage this hunk and all later hunks in the file
  933. d - do not stage this hunk or any of the later hunks in the file
  934. g - select a hunk to go to
  935. / - search for a hunk matching the given regex
  936. j - leave this hunk undecided, see next undecided hunk
  937. J - leave this hunk undecided, see next hunk
  938. k - leave this hunk undecided, see previous undecided hunk
  939. K - leave this hunk undecided, see previous hunk
  940. s - split the current hunk into smaller hunks
  941. e - manually edit the current hunk
  942. ? - print help
  943. @@ -3,6 +2,8 @@
  944. ### Places to Eat
  945. Delissima Pizza
  946. Lots of Shaorma places
  947. ### Fun things to do
  948. Go to Cetatuie, great view of the city
  949. Run in the rain, we have good rain here :)
  950. +
  951. +Great config file :)
  952. Stage this hunk [y,n,q,a,d,/,K,g,e,?]? n
  953.  
  954. [m@m-tower git-essentials-may-2016]$ git status
  955. On branch bzuzul13-hometown
  956. Your branch is up-to-date with 'origin/bzuzul13-hometown'.
  957. Changes to be committed:
  958. (use "git reset HEAD <file>..." to unstage)
  959.  
  960. modified: bzuzul13-cluj.md
  961.  
  962. Changes not staged for commit:
  963. (use "git add <file>..." to update what will be committed)
  964. (use "git checkout -- <file>..." to discard changes in working directory)
  965.  
  966. modified: bzuzul13-cluj.md
  967.  
  968. [m@m-tower git-essentials-may-2016]$ git commit -m "adding places to eat in cj"
  969. [bzuzul13-hometown 25876e7] adding places to eat in cj
  970. 1 file changed, 2 insertions(+), 1 deletion(-)
  971. [m@m-tower git-essentials-may-2016]$ git add -p
  972. diff --git a/bzuzul13-cluj.md b/bzuzul13-cluj.md
  973. index 05e82ca..0df9c4f 100644
  974. --- a/bzuzul13-cluj.md
  975. +++ b/bzuzul13-cluj.md
  976. @@ -5,3 +5,5 @@ Lots of Shaorma places
  977. ### Fun things to do
  978. Go to Cetatuie, great view of the city
  979. Run in the rain, we have good rain here :)
  980. +
  981. +Great config file :)
  982. Stage this hunk [y,n,q,a,d,/,e,?]? y
  983.  
  984. [m@m-tower git-essentials-may-2016]$ git commit -m "adding other things"
  985. [bzuzul13-hometown b0c2cff] adding other things
  986. 1 file changed, 2 insertions(+)
  987. [m@m-tower git-essentials-may-2016]$ git push
  988. Username for 'https://github.com': bzuzul13
  989. Password for 'https://bzuzul13@github.com':
  990. Counting objects: 6, done.
  991. Delta compression using up to 2 threads.
  992. Compressing objects: 100% (6/6), done.
  993. Writing objects: 100% (6/6), 701 bytes | 0 bytes/s, done.
  994. Total 6 (delta 1), reused 0 (delta 0)
  995. To https://github.com/githubteacher/git-essentials-may-2016.git
  996. deab14e..b0c2cff bzuzul13-hometown -> bzuzul13-hometown
  997. [m@m-tower git-essentials-may-2016]$ git pull
  998. remote: Counting objects: 168, done.
  999. remote: Compressing objects: 100% (161/161), done.
  1000. remote: Total 168 (delta 26), reused 0 (delta 0), pack-reused 3
  1001. Receiving objects: 100% (168/168), 19.77 KiB | 0 bytes/s, done.
  1002. Resolving deltas: 100% (26/26), done.
  1003. From https://github.com/githubteacher/git-essentials-may-2016
  1004. 0cc1a4e..4812c8d LEDominator-hometown -> origin/LEDominator-hometown
  1005. 76f4aad..60af99f abengtson-hometown -> origin/abengtson-hometown
  1006. adde618..2e51128 adhorrig-hometown -> origin/adhorrig-hometown
  1007. 3b216d1..1c6708a adowdle-hometown -> origin/adowdle-hometown
  1008. 6673530..0ee50e5 antoniomedrano-santabarbara -> origin/antoniomedrano-santabarbara
  1009. 9876ed7..c78c953 beardofedu-hometown -> origin/beardofedu-hometown
  1010. 3fba7ac..485f35a butlerx-hometown -> origin/butlerx-hometown
  1011. 9761f29..6273d8f cindyrains-hometown -> origin/cindyrains-hometown
  1012. 543a5b2..bcaf005 davedragon-hometown -> origin/davedragon-hometown
  1013. 1816c4a..08525b4 ebassias-hometown -> origin/ebassias-hometown
  1014. 69854c1..4412ea7 etfernandes-hometown -> origin/etfernandes-hometown
  1015. c2a3c3f..2fb36a1 fabgonzalez-hometown -> origin/fabgonzalez-hometown
  1016. c186045..610112d futurepr0n-hometown -> origin/futurepr0n-hometown
  1017. 807b93c..c88ea6e githubAlex-hometown -> origin/githubAlex-hometown
  1018. 1e84436..0547d2a githubteacher-hometown -> origin/githubteacher-hometown
  1019. 8c5785f..e38bb3c glennon-hometown -> origin/glennon-hometown
  1020. 23a3a95..20d3101 hamid914-hometown -> origin/hamid914-hometown
  1021. 0e66747..dde234e jeansbolong-hometown -> origin/jeansbolong-hometown
  1022. 19b980d..8424c57 jkero98-hometown -> origin/jkero98-hometown
  1023. 9b10695..68cfa9f josephyli-hometown -> origin/josephyli-hometown
  1024. 2c91d50..c90cf41 jtfernandes-sky-hometown -> origin/jtfernandes-sky-hometown
  1025. ec290c7..a0d5a6d kartikijoshi-hometown -> origin/kartikijoshi-hometown
  1026. 7089af0..0f27450 madepu81.sfo -> origin/madepu81.sfo
  1027. 5b4658a..7cd69dd master -> origin/master
  1028. 671dbc4..ead1316 mvee-hometown -> origin/mvee-hometown
  1029. 8dd9419..6ae7186 mvnu-awillia2-hometown -> origin/mvnu-awillia2-hometown
  1030. 863e446..a921905 nehakgoyal-hometown -> origin/nehakgoyal-hometown
  1031. * [new branch] origin/jkero98-hometown -> origin/origin/jkero98-hometown
  1032. e1bb212..94a0319 pramodr-hometown -> origin/pramodr-hometown
  1033. 33c36e6..9562e67 qfilu-srinagar -> origin/qfilu-srinagar
  1034. 1c38767..efc5499 rayphelps42-hometown -> origin/rayphelps42-hometown
  1035. c159726..dba3831 robertwayne-hometown -> origin/robertwayne-hometown
  1036. 4e79c58..4a02501 rustinalexandru-hometown -> origin/rustinalexandru-hometown
  1037. Already up-to-date.
  1038. [m@m-tower git-essentials-may-2016]$ git checkout master
  1039. Switched to branch 'master'
  1040. Your branch and 'origin/master' have diverged,
  1041. and have 3 and 8 different commits each, respectively.
  1042. (use "git pull" to merge the remote branch into yours)
  1043. [m@m-tower git-essentials-may-2016]$ git pull
  1044. remote: Counting objects: 16, done.
  1045. remote: Compressing objects: 100% (16/16), done.
  1046. remote: Total 16 (delta 1), reused 0 (delta 0), pack-reused 0
  1047. Unpacking objects: 100% (16/16), done.
  1048. From https://github.com/githubteacher/git-essentials-may-2016
  1049. 6622808..247ae56 bainbridgeisland-hometown -> origin/bainbridgeisland-hometown
  1050. 55d9870..0a21ac2 jinnatan-gz -> origin/jinnatan-gz
  1051. 62a24f1..97e67fa kgodoy-irvine -> origin/kgodoy-irvine
  1052. 07574d5..de7cb4a mvohlken-hometown -> origin/mvohlken-hometown
  1053. Merge made by the 'recursive' strategy.
  1054. hamid914-shahrekord.md | 3 +++
  1055. manojdatar-pune.txt | Bin 0 -> 53 bytes
  1056. mvee-london.md | 1 +
  1057. zfd-hometown.md | 4 ++++
  1058. 4 files changed, 8 insertions(+)
  1059. create mode 100644 hamid914-shahrekord.md
  1060. create mode 100644 manojdatar-pune.txt
  1061. create mode 100644 mvee-london.md
  1062. create mode 100644 zfd-hometown.md
  1063. [m@m-tower git-essentials-may-2016]$ git status
  1064. On branch master
  1065. Your branch is ahead of 'origin/master' by 4 commits.
  1066. (use "git push" to publish your local commits)
  1067. nothing to commit, working directory clean
  1068. [m@m-tower git-essentials-may-2016]$ git branch
  1069. beardofedu-hometown
  1070. bzuzul13-hometown
  1071. * master
  1072. [m@m-tower git-essentials-may-2016]$ git merge bzuzul13-hometown
  1073. Merge made by the 'recursive' strategy.
  1074. bzuzul13-cluj.md | 5 ++++-
  1075. 1 file changed, 4 insertions(+), 1 deletion(-)
  1076. [m@m-tower git-essentials-may-2016]$ git status
  1077. On branch master
  1078. Your branch is ahead of 'origin/master' by 7 commits.
  1079. (use "git push" to publish your local commits)
  1080. nothing to commit, working directory clean
  1081. [m@m-tower git-essentials-may-2016]$ git lol
  1082. * a405a32 (HEAD -> master) Merge branch 'bzuzul13-hometown'
  1083. |\
  1084. | * b0c2cff (origin/bzuzul13-hometown, bzuzul13-hometown) adding other things
  1085. | * 25876e7 adding places to eat in cj
  1086. * | 8b5574b Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1087. |\ \
  1088. | * \ 7cd69dd (origin/master, origin/HEAD) Merge pull request #21 from githubteacher/hamid914-hometown
  1089. | |\ \
  1090. | * \ \ 35cf81b Merge pull request #18 from zfdesign/zfd-hometown
  1091. | |\ \ \
  1092. | | * | | ba0d59b Adding hometown file and info
  1093. | * | | | fdc9a43 Merge pull request #19 from githubteacher/manojdatar-hometown
  1094. | |\ \ \ \
  1095. | | * | | | 9087c82 (origin/manojdatar-hometown) adding a stub of info to manojdatar file
  1096. | | |/ / /
  1097. | * | | | 9273d2a Merge pull request #22 from githubteacher/mvee-hometown
  1098. | |\ \ \ \
  1099. * | \ \ \ \ 11df967 Merge remote-tracking branch 'origin/master'
  1100. |\ \ \ \ \ \
  1101. | |/ / / / /
  1102. | | | | | /
  1103. | |_|_|_|/
  1104. |/| | | |
  1105. * | | | | deab14e added places
  1106. * | | | | 143138d adding a stub of info to the file
  1107. | |_|/ /
  1108. |/| | |
  1109. | | | | * 0a21ac2 (origin/jinnatan-gz) update md
  1110. | | | | * 55d9870 adding jinnatan-gz.md file
  1111. | |_|_|/
  1112. |/| | |
  1113. | | | | * daac1bb (origin/origin/jkero98-hometown) adding new line TEST1
  1114. | | |_|/
  1115. [m@m-tower git-essentials-may-2016]$ git push
  1116. Username for 'https://github.com': bzuzul13
  1117. Password for 'https://bzuzul13@github.com':
  1118. To https://github.com/githubteacher/git-essentials-may-2016.git
  1119. ! [rejected] master -> master (fetch first)
  1120. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  1121. hint: Updates were rejected because the remote contains work that you do
  1122. hint: not have locally. This is usually caused by another repository pushing
  1123. hint: to the same ref. You may want to first integrate the remote changes
  1124. hint: (e.g., 'git pull ...') before pushing again.
  1125. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  1126. [m@m-tower git-essentials-may-2016]$ git pull
  1127. remote: Counting objects: 18, done.
  1128. remote: Total 18 (delta 0), reused 0 (delta 0), pack-reused 18
  1129. Unpacking objects: 100% (18/18), done.
  1130. From https://github.com/githubteacher/git-essentials-may-2016
  1131. 7cd69dd..2051f4c master -> origin/master
  1132. Merge made by the 'recursive' strategy.
  1133. butlerx-dublin.md | 21 +++++++++++++++++++++
  1134. 1 file changed, 21 insertions(+)
  1135. create mode 100644 butlerx-dublin.md
  1136. [m@m-tower git-essentials-may-2016]$ git push
  1137. Username for 'https://github.com': bzuzul13
  1138. Password for 'https://bzuzul13@github.com':
  1139. To https://github.com/githubteacher/git-essentials-may-2016.git
  1140. ! [rejected] master -> master (fetch first)
  1141. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  1142. hint: Updates were rejected because the remote contains work that you do
  1143. hint: not have locally. This is usually caused by another repository pushing
  1144. hint: to the same ref. You may want to first integrate the remote changes
  1145. hint: (e.g., 'git pull ...') before pushing again.
  1146. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  1147. [m@m-tower git-essentials-may-2016]$ git pull
  1148. remote: Counting objects: 4, done.
  1149. remote: Compressing objects: 100% (4/4), done.
  1150. remote: Total 4 (delta 1), reused 0 (delta 0), pack-reused 0
  1151. Unpacking objects: 100% (4/4), done.
  1152. From https://github.com/githubteacher/git-essentials-may-2016
  1153. 2051f4c..1ba493d master -> origin/master
  1154. Merge made by the 'recursive' strategy.
  1155. jinnatan-gz.md | 8 ++++++++
  1156. 1 file changed, 8 insertions(+)
  1157. create mode 100644 jinnatan-gz.md
  1158. [m@m-tower git-essentials-may-2016]$ git status
  1159. On branch master
  1160. Your branch is ahead of 'origin/master' by 9 commits.
  1161. (use "git push" to publish your local commits)
  1162. nothing to commit, working directory clean
  1163. [m@m-tower git-essentials-may-2016]$ git push
  1164. Username for 'https://github.com': bzuzul13
  1165. Password for 'https://bzuzul13@github.com':
  1166. remote: Invalid username or password.
  1167. fatal: Authentication failed for 'https://github.com/githubteacher/git-essentials-may-2016.git/'
  1168. [m@m-tower git-essentials-may-2016]$ git push
  1169. Username for 'https://github.com': bzuzul13
  1170. Password for 'https://bzuzul13@github.com':
  1171. To https://github.com/githubteacher/git-essentials-may-2016.git
  1172. ! [rejected] master -> master (fetch first)
  1173. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  1174. hint: Updates were rejected because the remote contains work that you do
  1175. hint: not have locally. This is usually caused by another repository pushing
  1176. hint: to the same ref. You may want to first integrate the remote changes
  1177. hint: (e.g., 'git pull ...') before pushing again.
  1178. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  1179. [m@m-tower git-essentials-may-2016]$ git status
  1180. On branch master
  1181. Your branch is ahead of 'origin/master' by 9 commits.
  1182. (use "git push" to publish your local commits)
  1183. nothing to commit, working directory clean
  1184. [m@m-tower git-essentials-may-2016]$ git push
  1185. Username for 'https://github.com': bzuzul13
  1186. Password for 'https://bzuzul13@github.com':
  1187. To https://github.com/githubteacher/git-essentials-may-2016.git
  1188. ! [rejected] master -> master (fetch first)
  1189. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  1190. hint: Updates were rejected because the remote contains work that you do
  1191. hint: not have locally. This is usually caused by another repository pushing
  1192. hint: to the same ref. You may want to first integrate the remote changes
  1193. hint: (e.g., 'git pull ...') before pushing again.
  1194. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  1195. [m@m-tower git-essentials-may-2016]$ git pull
  1196. remote: Counting objects: 107, done.
  1197. remote: Compressing objects: 100% (107/107), done.
  1198. remote: Total 107 (delta 50), reused 0 (delta 0), pack-reused 0
  1199. Receiving objects: 100% (107/107), 13.91 KiB | 0 bytes/s, done.
  1200. Resolving deltas: 100% (50/50), done.
  1201. From https://github.com/githubteacher/git-essentials-may-2016
  1202. 1ba493d..3321b05 master -> origin/master
  1203. 4ff01eb..4b78847 carbinemonoxide-hometown -> origin/carbinemonoxide-hometown
  1204. Merge made by the 'recursive' strategy.
  1205. Hello | 1 +
  1206. LEDominator-strawberry-ca.md | 9 +++++++++
  1207. adhorrig-dublin.md | 9 +++++++++
  1208. ankermarco-hometown.md | 0
  1209. carbinemonoxide-akron-oh.md | 10 ++++++++++
  1210. ebassias-toronto-on.md | 14 ++++++++++++++
  1211. futurepr0n-toronto-can.md | 13 +++++++++++++
  1212. kgodoy-irvine.md | 11 +++++++++++
  1213. rayphelps42-goldendale-wa.md | 9 +++++++++
  1214. robertwayne-louisville-ky.md | 20 ++++++++++++++++++++
  1215. rrector-redmond-wa.md | 5 +++++
  1216. rustinalexandru-buzau.md | 10 ++++++++++
  1217. 12 files changed, 111 insertions(+)
  1218. create mode 100644 Hello
  1219. create mode 100644 LEDominator-strawberry-ca.md
  1220. create mode 100644 adhorrig-dublin.md
  1221. create mode 100644 ankermarco-hometown.md
  1222. create mode 100644 carbinemonoxide-akron-oh.md
  1223. create mode 100644 ebassias-toronto-on.md
  1224. create mode 100644 futurepr0n-toronto-can.md
  1225. create mode 100644 kgodoy-irvine.md
  1226. create mode 100644 rayphelps42-goldendale-wa.md
  1227. create mode 100644 robertwayne-louisville-ky.md
  1228. create mode 100644 rrector-redmond-wa.md
  1229. create mode 100644 rustinalexandru-buzau.md
  1230. [m@m-tower git-essentials-may-2016]$ git push
  1231. Username for 'https://github.com': bzuzul13
  1232. Password for 'https://bzuzul13@github.com':
  1233. To https://github.com/githubteacher/git-essentials-may-2016.git
  1234. ! [rejected] master -> master (fetch first)
  1235. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  1236. hint: Updates were rejected because the remote contains work that you do
  1237. hint: not have locally. This is usually caused by another repository pushing
  1238. hint: to the same ref. You may want to first integrate the remote changes
  1239. hint: (e.g., 'git pull ...') before pushing again.
  1240. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  1241. [m@m-tower git-essentials-may-2016]$ git pull
  1242. remote: Counting objects: 36, done.
  1243. remote: Compressing objects: 100% (30/30), done.
  1244. remote: Total 36 (delta 14), reused 0 (delta 0), pack-reused 6
  1245. Unpacking objects: 100% (36/36), done.
  1246. From https://github.com/githubteacher/git-essentials-may-2016
  1247. 3321b05..75fbe5e master -> origin/master
  1248. Merge made by the 'recursive' strategy.
  1249. cindyrains-fortwayne.md | 11 +++++++++++
  1250. pramodr-urbanail.md | 10 ++++++++++
  1251. 2 files changed, 21 insertions(+)
  1252. create mode 100644 cindyrains-fortwayne.md
  1253. create mode 100644 pramodr-urbanail.md
  1254. [m@m-tower git-essentials-may-2016]$ git push
  1255. Username for 'https://github.com': bzuzul13
  1256. Password for 'https://bzuzul13@github.com':
  1257. To https://github.com/githubteacher/git-essentials-may-2016.git
  1258. ! [rejected] master -> master (fetch first)
  1259. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  1260. hint: Updates were rejected because the remote contains work that you do
  1261. hint: not have locally. This is usually caused by another repository pushing
  1262. hint: to the same ref. You may want to first integrate the remote changes
  1263. hint: (e.g., 'git pull ...') before pushing again.
  1264. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  1265. [m@m-tower git-essentials-may-2016]$ git pull
  1266. remote: Counting objects: 44, done.
  1267. remote: Compressing objects: 100% (25/25), done.
  1268. remote: Total 44 (delta 20), reused 43 (delta 19), pack-reused 0
  1269. Unpacking objects: 100% (44/44), done.
  1270. From https://github.com/githubteacher/git-essentials-may-2016
  1271. 75fbe5e..548c7a1 master -> origin/master
  1272. Merge made by the 'recursive' strategy.
  1273. hamid914-shahrekord.md | 7 ++++++-
  1274. jtfernandes-sky-azores-portugal.md | 5 +++++
  1275. 2 files changed, 11 insertions(+), 1 deletion(-)
  1276. create mode 100644 jtfernandes-sky-azores-portugal.md
  1277. [m@m-tower git-essentials-may-2016]$ git push
  1278. Username for 'https://github.com': bzuzul13
  1279. Password for 'https://bzuzul13@github.com':
  1280. To https://github.com/githubteacher/git-essentials-may-2016.git
  1281. ! [rejected] master -> master (fetch first)
  1282. error: failed to push some refs to 'https://github.com/githubteacher/git-essentials-may-2016.git'
  1283. hint: Updates were rejected because the remote contains work that you do
  1284. hint: not have locally. This is usually caused by another repository pushing
  1285. hint: to the same ref. You may want to first integrate the remote changes
  1286. hint: (e.g., 'git pull ...') before pushing again.
  1287. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  1288. [m@m-tower git-essentials-may-2016]$ git push
  1289. Username for 'https://github.com': ^C
  1290. [m@m-tower git-essentials-may-2016]$ git pull
  1291. remote: Counting objects: 64, done.
  1292. remote: Compressing objects: 100% (37/37), done.
  1293. remote: Total 64 (delta 27), reused 63 (delta 26), pack-reused 0
  1294. Unpacking objects: 100% (64/64), done.
  1295. From https://github.com/githubteacher/git-essentials-may-2016
  1296. 548c7a1..c9075ef master -> origin/master
  1297. ^[[A^[[AMerge made by the 'recursive' strategy.
  1298. etfernandes-azores-portugal.md | 9 +++++++++
  1299. mvnu-awillia2-loudonville-oh.md | 9 +++++++++
  1300. 2 files changed, 18 insertions(+)
  1301. create mode 100644 etfernandes-azores-portugal.md
  1302. create mode 100644 mvnu-awillia2-loudonville-oh.md
  1303. [m@m-tower git-essentials-may-2016]$ git pull && git push
  1304. remote: Counting objects: 12, done.
  1305. remote: Compressing objects: 100% (9/9), done.
  1306. remote: Total 12 (delta 3), reused 12 (delta 3), pack-reused 0
  1307. Unpacking objects: 100% (12/12), done.
  1308. From https://github.com/githubteacher/git-essentials-may-2016
  1309. c9075ef..3e0d880 master -> origin/master
  1310. Merge made by the 'recursive' strategy.
  1311. beardofedu-tampa.md | 10 ++++++++++
  1312. 1 file changed, 10 insertions(+)
  1313. create mode 100644 beardofedu-tampa.md
  1314. Username for 'https://github.com': bzuzul13
  1315. Password for 'https://bzuzul13@github.com':
  1316. Counting objects: 20, done.
  1317. Delta compression using up to 2 threads.
  1318. Compressing objects: 100% (20/20), done.
  1319. Writing objects: 100% (20/20), 2.57 KiB | 0 bytes/s, done.
  1320. Total 20 (delta 10), reused 0 (delta 0)
  1321. To https://github.com/githubteacher/git-essentials-may-2016.git
  1322. 3e0d880..95f156d master -> master
  1323. [m@m-tower git-essentials-may-2016]$ git lol
  1324. * 95f156d (HEAD -> master, origin/master, origin/HEAD) Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1325. |\
  1326. | * 3e0d880 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1327. | |\
  1328. | * \ 71aa35c Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1329. | |\ \
  1330. | * \ \ 168e790 Merge branch 'beardofedu-hometown'
  1331. | |\ \ \
  1332. | | * | | c78c953 (origin/beardofedu-hometown) adding places to eat and things to do
  1333. | | * | | 9876ed7 (beardofedu-hometown) adding a stub of info to beardofedu file
  1334. * | | | | 2772a88 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1335. |\ \ \ \ \
  1336. | | |_|_|/
  1337. | |/| | |
  1338. | * | | | c9075ef Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1339. | |\ \ \ \
  1340. | | * \ \ \ 61c75bd Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1341. | | |\ \ \ \
  1342. | | | | |_|/
  1343. | | | |/| |
  1344. | | * | | | 7dcc2e9 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1345. | | |\ \ \ \
  1346. | | * \ \ \ \ 774b5d7 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1347. | | |\ \ \ \ \
  1348. | | * \ \ \ \ \ 743f6be Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1349. | | |\ \ \ \ \ \
  1350. | | * \ \ \ \ \ \ 9777df7 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1351. | | |\ \ \ \ \ \ \
  1352. | | * \ \ \ \ \ \ \ ce77e3a Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1353. :...skipping...
  1354. * 95f156d (HEAD -> master, origin/master, origin/HEAD) Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1355. |\
  1356. | * 3e0d880 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1357. | |\
  1358. | * \ 71aa35c Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1359. | |\ \
  1360. | * \ \ 168e790 Merge branch 'beardofedu-hometown'
  1361. | |\ \ \
  1362. | | * | | c78c953 (origin/beardofedu-hometown) adding places to eat and things to do
  1363. | | * | | 9876ed7 (beardofedu-hometown) adding a stub of info to beardofedu file
  1364. * | | | | 2772a88 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1365. |\ \ \ \ \
  1366. | | |_|_|/
  1367. | |/| | |
  1368. | * | | | c9075ef Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1369. | |\ \ \ \
  1370. | | * \ \ \ 61c75bd Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1371. | | |\ \ \ \
  1372. | | | | |_|/
  1373. | | | |/| |
  1374. | | * | | | 7dcc2e9 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1375. | | |\ \ \ \
  1376. | | * \ \ \ \ 774b5d7 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1377. | | |\ \ \ \ \
  1378. | | * \ \ \ \ \ 743f6be Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1379. | | |\ \ \ \ \ \
  1380. | | * \ \ \ \ \ \ 9777df7 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1381. | | |\ \ \ \ \ \ \
  1382. | | * \ \ \ \ \ \ \ ce77e3a Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1383. | | |\ \ \ \ \ \ \ \
  1384. | | * \ \ \ \ \ \ \ \ b6f3fb7 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1385. | | |\ \ \ \ \ \ \ \ \
  1386. | | * \ \ \ \ \ \ \ \ \ b4200c9 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1387. | | |\ \ \ \ \ \ \ \ \ \
  1388. | | * \ \ \ \ \ \ \ \ \ \ 3db0317 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1389. | | |\ \ \ \ \ \ \ \ \ \ \
  1390. | | * \ \ \ \ \ \ \ \ \ \ \ b13f7aa Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1391. | | |\ \ \ \ \ \ \ \ \ \ \ \
  1392. | | * \ \ \ \ \ \ \ \ \ \ \ \ e944d98 Merge branch 'mvnu-awillia2-hometown'
  1393. | | |\ \ \ \ \ \ \ \ \ \ \ \ \
  1394. | | | |_|_|_|_|_|_|_|_|_|_|/ /
  1395. | | |/| | | | | | | | | | | |
  1396. | | | * | | | | | | | | | | | 6ae7186 (origin/mvnu-awillia2-hometown) adding things to do in Loudonville
  1397. | | | * | | | | | | | | | | | acb5e7b adding places to eat in Loudonville
  1398. | | | * | | | | | | | | | | | 68c249b Merge remote-tracking branch 'origin/master' into mvnu-awillia2-hometown
  1399. | | | |\ \ \ \ \ \ \ \ \ \ \ \
  1400. [m@m-tower git-essentials-may-2016]$ echo "Here is one line of thext" >> file2.md
  1401. [m@m-tower git-essentials-may-2016]$ got add file2.md
  1402. bash: got: command not found
  1403. [m@m-tower git-essentials-may-2016]$ git add file2.md
  1404. [m@m-tower git-essentials-may-2016]$ git commit -m "adding file 2"
  1405. [master ad2c51b] adding file 2
  1406. 1 file changed, 1 insertion(+)
  1407. create mode 100644 file2.md
  1408. [m@m-tower git-essentials-may-2016]$ echo "Here is a second line of text" >> file2.md
  1409. [m@m-tower git-essentials-may-2016]$ git add .
  1410. [m@m-tower git-essentials-may-2016]$ git status
  1411. On branch master
  1412. Your branch is ahead of 'origin/master' by 1 commit.
  1413. (use "git push" to publish your local commits)
  1414. Changes to be committed:
  1415. (use "git reset HEAD <file>..." to unstage)
  1416.  
  1417. modified: file2.md
  1418.  
  1419. [m@m-tower git-essentials-may-2016]$ echo "Here is the third line of text" >> file2.md
  1420. [m@m-tower git-essentials-may-2016]$ git status
  1421. On branch master
  1422. Your branch is ahead of 'origin/master' by 1 commit.
  1423. (use "git push" to publish your local commits)
  1424. Changes to be committed:
  1425. (use "git reset HEAD <file>..." to unstage)
  1426.  
  1427. modified: file2.md
  1428.  
  1429. Changes not staged for commit:
  1430. (use "git add <file>..." to update what will be committed)
  1431. (use "git checkout -- <file>..." to discard changes in working directory)
  1432.  
  1433. modified: file2.md
  1434.  
  1435. [m@m-tower git-essentials-may-2016]$ git diff
  1436. diff --git a/file2.md b/file2.md
  1437. index 667007c..40b7682 100644
  1438. --- a/file2.md
  1439. +++ b/file2.md
  1440. @@ -1,2 +1,3 @@
  1441. Here is one line of thext
  1442. Here is a second line of text
  1443. +Here is the third line of text
  1444. [m@m-tower git-essentials-may-2016]$ git diff --staged
  1445. diff --git a/file2.md b/file2.md
  1446. index b252562..667007c 100644
  1447. --- a/file2.md
  1448. +++ b/file2.md
  1449. @@ -1 +1,2 @@
  1450. Here is one line of thext
  1451. +Here is a second line of text
  1452. [m@m-tower git-essentials-may-2016]$ git diff HEAD
  1453. diff --git a/file2.md b/file2.md
  1454. index b252562..40b7682 100644
  1455. --- a/file2.md
  1456. +++ b/file2.md
  1457. @@ -1 +1,3 @@
  1458. Here is one line of thext
  1459. +Here is a second line of text
  1460. +Here is the third line of text
  1461. [m@m-tower git-essentials-may-2016]$ git status
  1462. On branch master
  1463. Your branch is ahead of 'origin/master' by 1 commit.
  1464. (use "git push" to publish your local commits)
  1465. Changes to be committed:
  1466. (use "git reset HEAD <file>..." to unstage)
  1467.  
  1468. modified: file2.md
  1469.  
  1470. Changes not staged for commit:
  1471. (use "git add <file>..." to update what will be committed)
  1472. (use "git checkout -- <file>..." to discard changes in working directory)
  1473.  
  1474. modified: file2.md
  1475.  
  1476. [m@m-tower git-essentials-may-2016]$ git reset HEAD file2.md
  1477. Unstaged changes after reset:
  1478. M file2.md
  1479. [m@m-tower git-essentials-may-2016]$ git status
  1480. On branch master
  1481. Your branch is ahead of 'origin/master' by 1 commit.
  1482. (use "git push" to publish your local commits)
  1483. Changes not staged for commit:
  1484. (use "git add <file>..." to update what will be committed)
  1485. (use "git checkout -- <file>..." to discard changes in working directory)
  1486.  
  1487. modified: file2.md
  1488.  
  1489. no changes added to commit (use "git add" and/or "git commit -a")
  1490. [m@m-tower git-essentials-may-2016]$ git diff
  1491. diff --git a/file2.md b/file2.md
  1492. index b252562..40b7682 100644
  1493. --- a/file2.md
  1494. +++ b/file2.md
  1495. @@ -1 +1,3 @@
  1496. Here is one line of thext
  1497. +Here is a second line of text
  1498. +Here is the third line of text
  1499. [m@m-tower git-essentials-may-2016]$ git checkout --file2.md
  1500. error: unknown option `file2.md'
  1501. usage: git checkout [<options>] <branch>
  1502. or: git checkout [<options>] [<branch>] -- <file>...
  1503.  
  1504. -q, --quiet suppress progress reporting
  1505. -b <branch> create and checkout a new branch
  1506. -B <branch> create/reset and checkout a branch
  1507. -l create reflog for new branch
  1508. --detach detach the HEAD at named commit
  1509. -t, --track set upstream info for new branch
  1510. --orphan <new-branch>
  1511. new unparented branch
  1512. -2, --ours checkout our version for unmerged files
  1513. -3, --theirs checkout their version for unmerged files
  1514. -f, --force force checkout (throw away local modifications)
  1515. -m, --merge perform a 3-way merge with the new branch
  1516. --overwrite-ignore update ignored files (default)
  1517. --conflict <style> conflict style (merge or diff3)
  1518. -p, --patch select hunks interactively
  1519. --ignore-skip-worktree-bits
  1520. do not limit pathspecs to sparse entries only
  1521. --ignore-other-worktrees
  1522. do not check if another worktree is holding the given ref
  1523. --progress force progress reporting
  1524.  
  1525. [m@m-tower git-essentials-may-2016]$ git checkout -- file2.md
  1526. [m@m-tower git-essentials-may-2016]$ git status
  1527. On branch master
  1528. Your branch is ahead of 'origin/master' by 1 commit.
  1529. (use "git push" to publish your local commits)
  1530. nothing to commit, working directory clean
  1531. [m@m-tower git-essentials-may-2016]$ cat file2.md
  1532. Here is one line of thext
  1533. [m@m-tower git-essentials-may-2016]$ git log --oneline
  1534. ad2c51b adding file 2
  1535. 95f156d Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1536. 2772a88 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1537. 3e0d880 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1538. c9075ef Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1539. 143602b Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1540. f11476b Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1541. 71aa35c Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1542. 61c75bd Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1543. 7dcc2e9 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1544. 33f0fb7 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1545. 548c7a1 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1546. 0be84ac Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1547. 6f178a4 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1548. 37aecf3 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1549. 12a6771 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1550. 14d35ef Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1551. 60afaa8 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1552. 774b5d7 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1553. 75fbe5e Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1554. 9d705bb Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1555. 743f6be Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1556. 84a83ad Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1557. 4219cde Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1558. 6ed1195 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1559. 20d9bb6 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1560. f7c4b81 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1561. 3321b05 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1562. 9777df7 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1563. 26a57e6 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1564. 40430f4 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1565. ce77e3a Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1566. 8a245e9 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1567. 66cc0d9 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1568. 46ad764 Merge branch 'carbinemonoxide-hometown'
  1569. 15b0a01 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1570. 8b4e83f Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1571. ba8bd60 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1572. 0c9b00c Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1573. b6f3fb7 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1574. d423028 Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1575. 1199f40 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1576. 4b78847 Adding information to carbinemonoxide-akron-oh.md
  1577. 7b183ad Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1578. 4a46aed Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1579. aad7d00 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1580. 1468026 Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1581. [m@m-tower git-essentials-may-2016]$ git log --stat --pach
  1582. fatal: unrecognized argument: --pach
  1583. [m@m-tower git-essentials-may-2016]$ git log --stat --patch
  1584. commit ad2c51b00104ce9ec5cc4ec31d3db1f717de6208
  1585. Author: Marcu B <bzuzul13@gmail.com>
  1586. Date: Thu May 5 21:40:52 2016 +0300
  1587.  
  1588. adding file 2
  1589. ---
  1590. file2.md | 1 +
  1591. 1 file changed, 1 insertion(+)
  1592.  
  1593. diff --git a/file2.md b/file2.md
  1594. new file mode 100644
  1595. index 0000000..b252562
  1596. --- /dev/null
  1597. +++ b/file2.md
  1598. @@ -0,0 +1 @@
  1599. +Here is one line of thext
  1600.  
  1601. commit 95f156d233e2b6b36cfa8f690c24012f40f020dd
  1602. Merge: 2772a88 3e0d880
  1603. Author: Marcu B <bzuzul13@gmail.com>
  1604. Date: Thu May 5 21:38:48 2016 +0300
  1605.  
  1606. Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1607.  
  1608. commit 2772a88cd20e14b2d7e260f80ba81619c454706e
  1609. Merge: f11476b c9075ef
  1610. Author: Marcu B <bzuzul13@gmail.com>
  1611. Date: Thu May 5 21:38:31 2016 +0300
  1612.  
  1613. Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1614.  
  1615. commit 3e0d880cacb45c7afeb6e26e39db68cbac9339b9
  1616. Merge: 71aa35c c9075ef
  1617. Author: beardofedu <matthewddesmond@gmail.com>
  1618. Date: Thu May 5 14:38:31 2016 -0400
  1619.  
  1620. Merge branch 'master' of https://github.com/githubteacher/git-essentials-may-2016
  1621.  
  1622. commit c9075efd63cef338d1868d45e76f0a0f20fca3a7
  1623. Merge: 143602b 61c75bd
  1624. Author: Eduardo Fernandes <eduardotf93@gmail.com>
  1625. Date: Thu May 5 19:38:20 2016 +0100
  1626.  
  1627. Merge branch 'master' of github.com:githubteacher/git-essentials-may-2016
  1628.  
  1629. commit 143602b914bfb2c411919a33db29022ed63b2fcd
  1630. Merge: 33f0fb7 548c7a1
  1631. [m@m-tower git-essentials-may-2016]$ git revert
  1632. usage: git revert [<options>] <commit-ish>...
  1633. or: git revert <subcommand>
  1634.  
  1635. --quit end revert or cherry-pick sequence
  1636. --continue resume revert or cherry-pick sequence
  1637. --abort cancel revert or cherry-pick sequence
  1638. -n, --no-commit don't automatically commit
  1639. -e, --edit edit the commit message
  1640. -s, --signoff add Signed-off-by:
  1641. -m, --mainline <n> parent number
  1642. --rerere-autoupdate update the index with reused conflict resolution if possible
  1643. --strategy <strategy>
  1644. merge strategy
  1645. -X, --strategy-option <option>
  1646. option for merge strategy
  1647. -S, --gpg-sign[=<key-id>]
  1648. GPG sign commit
  1649.  
  1650. [m@m-tower git-essentials-may-2016]$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!