Sublime Merge combines the UI engine of Sublime Text, with a from-scratch implementation of Git. They have a announcement " custom implementation of Git for reading repositories, which drives a lot of our high-performance functionality. However, they defer to Git itself for operations that mutate the repository (Staging, Committing, Checking out branches, etc).". It runs on Windows, Mac and Linux.
Questions tagged [sublimemerge]
25 questions
16
votes
3 answers
Show only commits into certain branch on Sublime Merge
How can I filter my commit view to show only the commits into my master branch? To filter all the noise of seeing commits on all the other branches.
In Sourcetree this would be filtering "First Parent Only" on a given branch.
Adam Johns
- 35,397
- 25
- 123
- 176
7
votes
2 answers
Changing git author info on all commits worked on one of my repos but not the others, why?
I have various private GitHub repos and use Sublime Merge to manage my commits.
I want to change all the previous commit author details:
From Name: This, Email: this@domain.com
To: Name: That, Email: that@domain.com
I have therefore followed these…
bigdaveygeorge
- 947
- 2
- 12
- 32
6
votes
1 answer
How to "Resolve All" or bind a key to "Resolve Next" in Sublime Merge?
I have a ton of conflicts that I need to resolve, and it would really help if there was a way for me to just decide to "Resolve All", which would queue up all the files that need to be resolved.
Another idea is to bind the "Resolve" button to a key…
Linus Juhlin
- 1,175
- 10
- 31
6
votes
1 answer
What is Hunk history button in sublime merge
In Sublime Merge, while looking at the file history, on hovering the code diff area there appears a Hunk history button.
What is the functionality offered with this button?
Vivek
- 11,938
- 19
- 92
- 127
6
votes
2 answers
Sublime Merge SSH Failing when Key has password
When I try to clone a repo I get a git failed with exit code 128.
Also when I try to push/pull I get a git@gitlab.com public key denied.
In my ~/.ssh folder I have a config file that looks like this:
Host mycompany.gitlab.com
HostName…
bryan
- 8,879
- 18
- 83
- 166
5
votes
1 answer
Sublime Merge - keyboard shortcut for "File History"
How can I make a keyboard shortcut for Navigate > File History... in Sublime Merge?
CrazyTim
- 6,695
- 6
- 34
- 55
3
votes
1 answer
Rebase my changes on top of another branch updates in Sublime Merge
I cloned a Git repo/branch (origin/master). I made my changes and committed on another branch (mine) and I set another remote for it (office/mine). I did three commits actually.
Now there are updates on origin/master that I need to incorporate. I…
KcFnMi
- 5,516
- 10
- 62
- 136
2
votes
2 answers
How do I remove Sublime Merge integration from sublime text
I simply don't want them, prefer the git command line, but they are added to my commands as if they were installed, even if I never installed sublime merge.
Is there a way to remove them completly from sublime text command panel?
joseramonc
- 1,811
- 2
- 21
- 40
2
votes
1 answer
Git push and pull from different repo
My colleague and I are working on a project. However, he is the main person in-charge of the project and I am developing a module which is a part of that project. I want to know if what I wish to do is possible and the steps on how do I go about…
Raymond C.
- 572
- 4
- 24
2
votes
1 answer
Show staged changes in Sublime Merge
I don't see any way to view my staged changes in Sublime Merge. I can only see changes not staged for commit.
Is there a way to view staged changes? I'm looking for something similar to using git diff --cached but in Sublime Merge's UI.
Increasingly Idiotic
- 5,700
- 5
- 35
- 73
1
vote
0 answers
Using Sublime Merge with Vagrant
I have a Rails app running local in a Vagrant box. When i make commits from outside de VM console with Sublime Merge but changes are not reflected after git status. Although the files are there it doesn't allow to change branches.
What could cause…
Joseph Palmezano
- 1,245
- 2
- 11
- 16
1
vote
1 answer
Sublime Merge - How to emulate git log -p
I want to get the logs of a specific folder in the repo.
How do I do that in Sublime Merge?
For example, with this tree:
root
├── services
│ ├── pom.xml
│ └── protobuf
└── workers
├── asyncprocess
│ ├── pom.xml
├── demux
│ …
nephewtom
- 2,941
- 3
- 35
- 49
1
vote
1 answer
Commit only part of a file in Git using sublime merge
Is there a way to do Commit only part of a file in Git in Sublime Merge?
Tejas Shetty
- 685
- 6
- 30
1
vote
1 answer
undo dropped commit in sublime merge
I just switched to sublime merge away from github desktop (what an improvement), however I just performed the menu option Edit commit\drop selected commits thinking it was the equivalent of the undo commit button in github desktop.
That has not…
mwal
- 2,803
- 26
- 34
1
vote
2 answers
In sublimemerge, how do you collapse the sidebar groups such as `tags` or `stashes`?
When using sublimemerge with large repo's, the sidebar can get quite noisey.
Is there a way to collapse the sidebar groups?
Chris
- 54,599
- 30
- 149
- 186