Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Tortoise GIT - show changes created in branch after merge

Is it possible to show only commits and changes created in a specific branch? If I do this before merge it works. If I merge master branch to this branch (to make it actual) then I see commits and merges made in master branch. Is there some way how to filter it?

like image 510
Daew dawe Avatar asked Sep 03 '14 05:09

Daew dawe


People also ask

What happens to branch after merge git?

When you perform a merge, you effectively merge one branch into another—typically a feature branch or bug fix branch into a main branch such as master or develop. Not only will the code changes get merged in, but also all the commits that went into the feature branch.

Does git merge change history?

A merge takes two or more branches, and creates a commit that interleaves the changes in all parents (resolving conflicts, as needed; the user has to decide how). git does not change history by itself.

How do you view all activity in the current branch?

How do you view all activity in the current branch? To see local branches, use the git branch command. The git branch command lets you see a list of all the branches stored in your local version of a repository.


1 Answers

You can do this using git bash (packaged tool with git), it's an alternative. This is a more effective solution for this question:

  • type the command:
git log --graph [branch] 
  • type this too:
git diff ..master path/to/file

Credits to the author @lukman of this answer to a similar question here on SO.

like image 77
Erich Malfertheiner Avatar answered Oct 16 '22 19:10

Erich Malfertheiner