minte9
LearnRemember / GIT



Branches

To get branch files differences use grep or --name-status 
 
git diff master..dev | grep "^diff"

    diff --git a/config/_database.php b/config/_database.php
    diff --git a/config/database.php b/config/database.php
    diff --git a/controllers/reports.php b/controllers/reports.php

git diff master..dev --name-status

    D       config/_database.php
    M       config/database.php
    M       controllers/reports.php

Files

Difference between branches files. 
 
git diff master..dev helper/my_helper.php

Merge

Merge one file from dev. 
 
git diff master..dev views/header.phtml

git checkout dev views/header.phtml

Remote 

 
git cherry -v origin/master

git --stat --cached origin/master

Meaning

You have a new merge commit F, which has the history from D and E. The master branch does not get a file README, already deleted in master (in D). 
 
master * A *-+* C * D --+-- F
                    /              /
dev ** B --+* E **--/






Questions and answers




Branch files difference

  • a) git diff master..dev | grep "files"
  • b) git diff master..dev --name-status

Merge one file between branches

  • a) git diff master..dev file1
  • b) git checkout dev file1


References