How to inject a commit between some two arbitrary commits in the past?
Suppose I have the following commit history on my local-only branch: A — B — C How do I insert a new commit … Read more
git-rebase
Why does git-rebase give me merge conflicts when all I’m doing is squashing commits?
We have a Git repository with over 400 commits, the first couple dozen of which were a lot of trial-and-error. We want to … Read more
git rebase without changing commit timestamps
Would it make sense to perform git rebase while preserving the commit timestamps? I believe a consequence would be that the new branch … Read more
rebase in progress. Cannot commit. How to proceed or stop (abort)?
When I run: git status I see this: rebase in progress; onto 9c168a5 You are currently rebasing branch ‘master’ on ‘9c168a5’. (all conflicts … 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
How to git rebase a branch with the onto command?
I have noticed that the two blocks of following git commands have different behaviours and I don’t understand why. I have an A … Read more
How do I squash two non-consecutive commits?
I’m a bit new to the whole rebasing feature within git. Let’s say that I made the following commits: A -> B -> … Read more
What does “Auto packing the repository for optimum performance” mean?
I’m having a problem with my git repo. For the last couple of days whenever I do a push to the server I … Read more