Top "Git-rebase" questions

With the git-rebase command, you can take the changes from one branch and replay them on top of another branch.

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 …

git rebase git-rebase git-rewrite-history
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 …

git git-rebase git-merge git-branch git-checkout
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 …

git timestamp git-rebase
Edit the root commit in Git?

There's ways to change the message from later commits: git commit --amend # for the most recent commit git rebase --interactive …

git git-rebase git-commit git-rewrite-history amend
How to abort a git rebase from inside vim during interactive editing

When I do an interactive rebase, e.g. git rebase -i HEAD~3 the rebase interactive editor (vim in my case) …

git vim git-rebase
How to merge git commits in the develop branch to a feature branch

I have a develop branch and a feature branch in my git repo. I added a commit to develop and …

git git-merge git-rebase feature-branch
git rebase after previous git merge

I have the following situation: I created a clone(Y) from a main repository(X), because there were many people …

git merge rebase git-rebase
I need to pop up and trash away a "middle" commit in my master branch. How can I do it?

For example, in the following master branch, I need to trash just the commit af5c7bf16e6f04321f966…

git github git-rebase git-reset git-revert
Rebasing in smartgit "git-am is in progress"

I will try to explain the problem that I have. I have used the rebase option via git bash many …

git rebase git-rebase smartgit
Error with git rebase ("could not apply...")

I'm the administrator of the GitHub repository https://github.com/plison/opendial. I would like to reduce the number of …

git github git-svn rebase git-rebase