alberanid/git-crash-course
3
2
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: alberanid:b8b5e7df218ff5a0149596b7ceabf4b0375bef07
Branches Tags
alberanid:master
alberanid:two-levels
alberanid:tutorial
..
compare: alberanid:d9d83918e9fca087901ad276abaa8a00f7f47448
Branches Tags
alberanid:master
alberanid:two-levels
alberanid:tutorial

7 commits
b8b5e7df21 ... d9d83918e9

Author SHA1 Message Date
Davide Alberani
d9d83918e9 Merge branch 'dcast78-dcast78/fix/branch_cmd' 
* dcast78-dcast78/fix/branch_cmd:
  edited for brevity
  Typo correction
  Comment clarification
  Command correction
  Fix command git branch -b fix/bug-123
 2017-09-18 20:37:00 +02:00
Davide Alberani
da8dc16453 edited for brevity 2017-09-18 20:36:40 +02:00
Davide Alberani
691dff63b8 Merge branch 'dcast78/fix/branch_cmd' of git://github.com/dcast78/git-crash-course into dcast78-dcast78/fix/branch_cmd 
* 'dcast78/fix/branch_cmd' of git://github.com/dcast78/git-crash-course:
  Typo correction
  Comment clarification
  Command correction
  Fix command git branch -b fix/bug-123
 2017-09-18 20:32:37 +02:00
dcast78
6163dc855a Typo correction 
Typo correction
 2017-09-18 13:24:57 +02:00
dcast78
b56057ca94 Comment clarification 
More info about git checkout [-b] fix/bug-123 command
 2017-09-18 13:19:44 +02:00
dcast78
bae335007d Command correction 
Replace git branch -b fix/bug-123   with  git checkout [-b] fix/bug-123.
Add comment about -b parameter, if branch already exist, the command do not create (correct) and do not checkout a new branch without info.
 2017-09-18 13:09:09 +02:00
dcast78
0dd661ab77 Fix command git branch -b fix/bug-123 
Correction of command with git checkout -b fix/bug-123 ( -b <branch> create and checkout a new branch)
 2017-09-18 13:01:37 +02:00
1 changed files with 4 additions and 3 deletions
Show stats Expand all files Collapse all files

7
git-crash-course.md
View file

@ -368,7 +368,7 @@ Spostarsi su un branch:
$ git checkout fix/bug-123 $ git checkout fix/bug-123
Creare e spostarsi in un singolo comando: Creare e spostarsi in un singolo comando (può essere usato solo se il branch non esiste ancora):
$ git checkout -b fix/bug-123 $ git checkout -b fix/bug-123
@ -394,7 +394,7 @@ Creare e spostarsi in un singolo comando:
## Rimettere insieme i pezzi: merge ## Rimettere insieme i pezzi: merge
$ git branch -b fix/bug-123 $ git checkout -b fix/bug-123
$ # editiamo nuovofile.txt $ # editiamo nuovofile.txt
$ git add nuovofile.txt $ git add nuovofile.txt
$ git commit $ git commit
@ -420,7 +420,8 @@ Il comando commit ha le opzioni **--ff-only** e **--no-ff** per decidere come co
## Risoluzione dei conflitti ## Risoluzione dei conflitti
$ git branch -b fix/bug-123 $ git branch fix/bug-123
$ git checkout fix/bug-123
$ # editiamo file.txt $ # editiamo file.txt
$ git add file.txt $ git add file.txt
$ git commit $ git commit