GitHub

Роман Парадеев

Контроль версий

copy / paste


    






    

        
Репозиторий, коммит, история

    


    

        

        
Создание репозитория

        
❯ 

        
Initialized empty Git repository in /.git/
        

    


    

        

        
Создание коммита

        
❯ 

        
master (root-commit) 7e665a1] 🦄 add docs
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 README.md
        

    


    

        

        
Просмотр истории

        
❯ 

        
commit fb5336e419af32d0b0f25de1322e47f332ca4601
Author: Roman Paradeev <grumpy@yandex-team.ru>
Date:   Thu Feb 11 03:47:00 2016 +0500

    🦄 testing

commit 7e665a17b3ce82a4c529999811908b63811e8b9f
Author: Roman Paradeev <grumpy@yandex-team.ru>
Date:   Thu Feb 11 03:37:38 2016 +0500

    🔬 add docs
        

    






    

        
Ветки и слияние

    


    

        

        
Создание ветки

        
❯ 

    


    

         
     


    

        
    
        
Слияние веток

        
❯ 

    


    

        
    


    

        
    
        
Р-р-ребейз

        
❯ 

    


    

        
    


    

        
    
        
Удаление ветки

        
❯ 

    






    

        
Рабочая директория

    


    

        

        
❯ 

        
On branch master

Initial commit

nothing to commit
        

    


    

        

        
.
├── .git
└── README.md
        

    


    

        

        
❯ 

        
Untracked files:

    README.md

nothing added to commit
        

    


    

        

        
❯ 

        
Changes to be committed:

    new file:   README.md
        

    


    

        

        
❯ 

        
master (root-commit) 7e665a1] 🦄 add docs
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 README.md
        

    


    

        

        
.
├── .git
├── README.md
├── index.js
└── test.js
        

    


    

        

        
❯ 

        
Changes to be committed:

    new file:   index.js
    new file:   test.js
        

    


    

        
❯ git rm – удаление

        
❯ git mv – перемещение

    


    

        

        
❯ 

        
[master fb5336e] 🔬 testing
 2 files changed, 4 insertions(+)
 create mode 100644 index.js
 create mode 100644 test.js
        

    


    

        

        
❯ 

        
commit fb5336e419af32d0b0f25de1322e47f332ca4601
Author: Roman Paradeev <grumpy@yandex-team.ru>
Date:   Thu Feb 11 03:47:00 2016 +0500

    🦄 testing

commit 7e665a17b3ce82a4c529999811908b63811e8b9f
Author: Roman Paradeev <grumpy@yandex-team.ru>
Date:   Thu Feb 11 03:37:38 2016 +0500

    🔬 add docs
        

    


    

        

        
.
├── .git
├── README.md
├── index.js
├── stdout.log
└── test.js
        

    


    

        

        
❯ 

        
Changes to be committed:

    new file:   stdout.log
        

    


    

    

        

        
❯ 

        
Untracked files:

    stdout.log
        

    


    

    

        
.gitignore

        
node_modules
*.log
        

    


    

        

        
.
├── .git
├── .gitignore
├── README.md
├── index.js
├── stdout.log
└── test.js
        

    





    

        
Удалённый репозиторий

    


    

    


    

        

        
❯ 

        
Username for 'https://github.com':
        

    


    

    


    

        

        
❯ 

    


    

    

    

    

    


    

        

        
❯ 

        
From https://github.com/sameoldmadness/git-tutorial
   fb5336e..db7dd75  master     -> origin/master
Updating fb5336e..db7dd75
Fast-forward
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
        

    






    

        
Разрешение конфликтов

    


    

        

        
❯ 

    


    

        

        
❯ 

    


    

        
❯ git merge addTest

        
You have unmerged paths.
  (fix conflicts and run "git commit")

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   test.js
        

    


    

        
<<<<<<< HEAD
console.log('2 + 3 = 5', test(2 + 3) === 5);
console.log('3 + 4 = 7', test(3 + 4) === 7);
=======
console.log(test(2 + 3) === 5);
console.log(test(4 + 3) === 7);

>>>>>>> addTest
        

    


    

        
<<<<<<< HEAD
console.log('2 + 3 = 5', test(2 + 3) === 5);
console.log('3 + 4 = 7', test(3 + 4) === 7);
=======
console.log(test(2 + 3) === 5);
console.log(test(4 + 3) === 7);

>>>>>>> addTest
        

    


    

        
❯ git config --global
merge.tool kdiff3

    


    

        

        
❯ 

        
Merging:
test.js

Normal merge conflict for 'test.js':
  {local}: modified file
  {remote}: modified file
        

    


    

    

    

    


    

        

        
❯ 

        
[master deaebc7] Merge branch 'addTest'
        

    


    

        
❯ git log --oneline
--graph --decorate

        
* deaebc7 (HEAD -> master) Merge branch addTest
|\
| * e1d9a96 (addTest) addTest
* | 79b2be6 add test msg
|/
* f2f5f94 +1 test
* 8cd0347 add gitignore
* db7dd75 Добавлено описание проекта
* fb5336e 🦄 testing
* 7e665a1 🔬 add docs
        

    






    
Ссылки