git rebase, keeping track of ‘local’ and ‘remote’
When doing a git rebase, I often have difficulty working out what is happening with the ‘local’ and ‘remote’ when resolving conflicts. I … Read more
rebase
Hg: How to do a rebase like git’s rebase
In Git I can do this: 1. Start working on new feature: $ git co -b newfeature-123 # (a local feature development branch) … Read more
Combine the first two commits of a Git repository?
Suppose you have a history containing the three commits A, B and C: A-B-C I would like to combine the two commits A … Read more
Git: How to rebase to a specific commit?
I’d like to rebase to a specific commit, not to a HEAD of the other branch: A — B — C master \ … Read more
Rebasing a Git merge commit
Take the following case: I have some work in a topic branch and now I’m ready to merge back to master: * eb3b733 … Read more
Insert a commit before the root commit in Git?
I’ve asked before about how to squash the first two commits in a git repository. While the solutions are rather interesting and not … Read more
Can I make fast forwarding be off by default in git?
I can’t really ever think of a time when I would use git merge rather than git rebase and not want to have … Read more
How to get “their” changes in the middle of conflicting Git rebase?
I have conflicting branches, feature_x branched from main. Let’s say when rebasing feature_x on current main, while resolving conflicts, I decide to take … Read more
Remove folder and its contents from git/GitHub’s history
I was working on a repository on my GitHub account and this is a problem I stumbled upon. Node.js project with a folder … Read more
What is the difference between merge –squash and rebase?
I’m new to git and I’m trying to understand the difference between a squash and a rebase. As I understand it you perform … Read more