sooqua
Reputation: 438
Git - What's the branch I'm merging from?
How to get name of the branch I'm merging from? git status tells me only that I'm merging, but I forgot what branch exactly I'm merging...
On branch master
Your branch is up-to-date with 'origin/master'.
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
Upvotes: 1
Views: 105
Answers (3)
CodeWizard
Reputation: 142362
To make it clear for everyone who still seek for similar answer
The answer was posted as comment by @PetSerAL
xargs git log --decorate --no-walk=unsorted --oneline < .git/MERGE_HEAD
Upvotes: 1
Matias Barone
Reputation: 168
try git show-branch
It show a list of branches and the last commit on each.
If there is a merge it show a - in the merge.
Upvotes: 2
Related Questions
- How do I find the branch a branch requested to be merged into?
- What git branch was I just in?
- What is the dominant branch when doing a git merge
- How to determine a git branch source or find a merge commit
- Beginner Git merge confuse about two branches
- Git merge - Source and destination branch name identification
- Git: How to find which branches a commit was merged into?
- Which Branch Am I From?
- git: finding which merge brough commit into the current branch
- git pull from branch complains about which branch to merge with