官术网_书友最值得收藏!

The difference between branches

Checking the difference between branches can show valuable information before merging.

A regular Git diff between two branches will show you all the information, but it can be rather exhausting to sit and look at; maybe you are only interested in one file. Thus, you don't need the long unified diff.

Getting ready

To start with, we decide on two branches, tags, or commits we want to see the diff between. Then, to list files that have changed between these branches, you can use the --name-only flag.

How to do it…

Perform the following steps to see the difference between the branches:

  1. Diff the origin/stable-3.1 with origin/stable-3.2 branch:
    $ git diff --name-only origin/stable-3.1 origin/stable-3.2 org.eclipse.jgit/src/org/eclipse/jgit/transport/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetch
    More output..
    
  2. We are building the command in this pattern, that is, git diff [options] <commit> <commit> <path>. Then, we can diff what we care about while looking into the differences between branches. This is very useful if you are responsible for a subset of the source code, and you wish to diff that area only.
  3. Let's try the same diff between branches, but this time we will diff the entire branches, not just a subdirectory; however, we only want to show the deleted or added files between the branches. This is done by using the --diff-filter=DA and --name-status options. The --name-status option will only show the filenames and the type of change. The --diff-filter=DA option will only show the deleted and added files:
    $ git diff --name-status --diff-filter=DA origin/stable-3.1 origin/stable-3.2
    D org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/Sam
    A org.eclipse.jgit.packaging/org.eclipse.jgit.target/jg
     More output..
    
  4. This shows the files that have been added and deleted while moving from origin/stable-3.1 to origin/stable-3.2:
  5. If we switch the branches around like in the following command, we will get the opposite result.
    $ git diff --name-status --diff-filter=DA origin/stable-3.2 origin/stable-3.1
    A org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/Sam
    D org.eclipse.jgit.packaging/org.eclipse.jgit.target/jg
     More output..
    

Note that the indication letters A and D switched places because now we want to know what happens if we move from origin/stable-3.2 to origin/stable-3.1.

There's more…

There are more options in the help files for Git. Just run git merge --help or git branch --help to see what other options you have. The option I have used and the examples shown are all examples that have given me the edge while working with Git as a release manager and Git mentor at Nokia.

主站蜘蛛池模板: 宣恩县| 鄂托克旗| 英超| 乐至县| 嫩江县| 达日县| 奉节县| 堆龙德庆县| 静宁县| 衡南县| 循化| 盐山县| 鸡泽县| 电白县| 吴堡县| 措勤县| 义乌市| 南雄市| 泸水县| 深州市| 仙游县| 榆林市| 武川县| 靖江市| 南川市| 布拖县| 朔州市| 乌兰察布市| 耒阳市| 电白县| 斗六市| 潞城市| 江达县| 岑巩县| 长寿区| 洛阳市| 徐汇区| 新民市| 修水县| 滕州市| 乾安县|