Using Git, show all commits that are in one branch, but not the other(s)
I have an old branch, which I would like to delete. However, before doing so, I want to check that all commits made to this branch were at some point merged into some other branch. Thus, I'd like to see all commits made to my current branch which have not been applied to any other branch [or, if this is not possible without some scripting, how does one see all commits in one branch which have not been applied to another given branch?].
To see a list of which commits are on one branch but not another, use git log:
git log --no-merges oldbranch ^newbranch
...that is, show commit logs for all commits on oldbranch that are not on newbranch. You can list multiple branches to include and exclude, e.g.
git log --no-merges oldbranch1 oldbranch2 ^newbranch1 ^newbranch2
Note: on Windows command prompt (not Powershell) ^ is an escape key, so it needs to be escaped with another ^:
git log --no-merges oldbranch ^^newbranch
You probably just want
git branch --contains branch-to-delete
This will list all branches which contain the commits from "branch-to-delete". If it reports more than just "branch-to-delete", the branch has been merged.
Your alternatives are really just rev-list syntax things. e.g. git log one-branch..another-branch shows everything that one-branch needs to have everything another-branch has.
You may also be interested in git show-branch as a way to see what's where.
git branch --contains some-branch only returns some-branch, then it does return something, but it has not been merged.
git log foo..bar will show the commits between bar's latest and foo's latest, but not other commits missing from further back in time. To see everything in bar but not in foo, you should use @jimmyorr's solution.
To show the commits in oldbranch but not in newbranch:
git log newbranch..oldbranch
To show the diff by these commits (note there are three dots):
git diff newbranch...oldbranch
Here is the doc with a diagram illustration https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Commit-Ranges
newbranch or oldbranch, we can do git log ..oldbranch or git log newbranch.. respectively
.. between the refs' names. I also used the --cherry-pick option to hide commits that are present on both branches but have a different hash because they were cherry-picked from one branch to the other.
For those still looking for a simple answer, check out git cherry. It compares actual diffs instead of commit hashes. That means it accommodates commits that have been cherry picked or rebased.
First checkout the branch you want to delete:
git checkout [branch-to-delete]
then use git cherry to compare it to your main development branch:
git cherry -v master
Example output:
+ 8a14709d08c99c36e907e47f9c4dacebeff46ecb Commit message
+ b30ccc3fb38d3d64c5fef079a761c7e0a5c7da81 Another commit message
- 85867e38712de930864c5edb7856342e1358b2a0 Yet another message
Note: The -v flag is to include the commit message along with the SHA hash.
Lines with the '+' in front are in the branch-to-delete, but not the master branch. Those with a '-' in front have an equivalent commit in master.
For JUST the commits that aren't in master, combine cherry pick with grep:
git cherry -v master | grep "^\+"
Example output:
+ 8a14709d08c99c36e907e47f9c4dacebeff46ecb Commit message
+ b30ccc3fb38d3d64c5fef079a761c7e0a5c7da81 Another commit message
diff utility to compare the various files. Or, you could create a temporary branch and squash all the commits in that similar to what you did with the original branch, and then use this, which I think would work.
While some of the answers posted here will help find what you seek, the following sub-command of git branch is a more suitable solution for your task.
While in master one could run the command to enumerate the branches one could safely remove, like so:
git branch --merged
develop
fpg_download_links
* master
master_merge_static
# Delete local and remote tracking branches you don't want
git branch -d fpg_download_links
git push origin :fpg_download_links
git branch -d master_merge_static
git push origin :master_merge_static
# There is also a flag to specify remote branches in the output
git branch --remotes --merged
jimmyorr's answer does not work on Windows. it helps to use --not instead of ^ like so:
git log oldbranch --not newbranch --no-merges
^ is supported on Windows, but needs to be escaped, which, in Windows, is (another) ^: git log oldbranch ^^newbranch --no-merges.
If it is one (single) branch that you need to check, for example if you want that branch 'B' is fully merged into branch 'A', you can simply do the following:
$ git checkout A
$ git branch -d B
git branch -d <branchname> has the safety that "The branch must be fully merged in HEAD."
Caution: this actually deletes the branch B if it is merged into A.
You can use this simple script to see commits that are not merged
#!/bin/bash
# Show commits that exists only on branch and not in current
# Usage:
# git branch-notmerge <branchname>
#
# Setup git alias
# git config alias.branch-notmerge [path/to/this/script]
grep -Fvf <(git log --pretty=format:'%H - %s') <(git log $1 --pretty=format:'%H - %s')
You can use also tool git-wtf that will display state of branches
I'd like to count the commits too, so here's how to do that:
Count how many commits are on the current branch (HEAD), but NOT on master:
git log --oneline ^master HEAD | wc -l
wc -l means "word count"--count the number of 'l'ines.
And of course to see the whole log messages, as other answers have given:
git log ^master HEAD
...or in a condensed --oneline form:
git log --oneline ^master HEAD
If you don't want to count merge commits either, you can exclude those with --no-merges:
git log --oneline --no-merges ^master HEAD | wc -l
etc.
Show commits and commit contents from other-branch that are not in your current branch:
git show @..other-branch
Additionally you can apply the commits from other-branch directly to your current branch:
git cherry-pick @..other-branch
Just use git cherry to pick all commits in the branch newFeature42 for example:
git cherry -v master newFeature42
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- Undoing a git rebase
- How do I make Git forget about a file that was tracked, but is now in .gitignore?
- How do I delete a commit from a branch?
- Move the most recent commit(s) to a new branch with Git
- Undo a Git merge that hasn't been pushed yet
- How to change the URI (URL) for a remote Git repository?
- Make the current Git branch a master branch
- How do I safely merge a Git branch into master?
- How do I get the current branch name in Git?
^as a prefix here confused me. In this context it means exclude that branch. Using^as a suffix would be a relative reference to the parent commit of that branch.oldbranchandnewbranchare (to me) somewhat confusingly named. I'd suggest something likebranch_withcommitsandbranch_missingcommits, even though it's a little verbose, because it's immediately clear what the command is looking for. I'd make the edit myself, but that feels like a pretty major alteration to make preemptively. Would you mind if I make this change (or could you make it yourself)?^, we could replace^newbranchwith^excludebranch.