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?].
11 Answers
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
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
Related