4

I make a lot of bugfix and feature branches and in the end merge them all into a release candidate (rc). but when i test the rc I am not sure if i have merged in all the branches. How can I find out which branches are missing?

I tried gitk, but it seems it shows only the branches that are already merged in the branch that I am on. But I am interested in the branches that are not merged.

There is a nice display of all the branches at github ("network"), but it is always behind, so it is not as useful as it could be.

Nicholas Riley
  • 43,532
  • 6
  • 101
  • 124
user89021
  • 14,784
  • 16
  • 53
  • 65

3 Answers3

5

Use gitk --all to see all branches. Also, if you're on Windows, I'd recommend QGit instead of gitk. It has a better rendering algorithm of the commits graph.

Ionuț G. Stan
  • 176,118
  • 18
  • 189
  • 202
2

Take a look at git cherry (not to be confused with git cherry-pick).

Nicholas Riley
  • 43,532
  • 6
  • 101
  • 124
1
git branch --no-merged

is a clean way of showing the list of branches which need to be merged to the current branch.

"How to get the changes on a branch in git" references a nice script to format the result of that command.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250