git-rebase

Suppose I've got the following history, where the top line is the master branch, the lower one is a feature branch that's merged with master at one point, and D just reverts C (which means that the working directory is the same in B and D ). A---B---C---D master \ \ E---F---G feature I want to add C and its reversion D to the history before the merge in F , like this: A---B---C---D master \ \ E-----------F'--G' feature I don't want to change E (which is actually a long series of commits). git rebase --onto D B (as suggested here ) results in merge conflicts (with or without --preserve-merges )

I'm having a serious problem trying to do git rebase --interactive on my repo. I get the cryptic error fatal: ref HEAD is not a symbolic ref , and my rebase ceases to function. I must git rebase --abort to get back to a good state. Here are the output(s) I receive: https://gist.github.com/d38f1e2d2ec9bc480b6f What I've been told in the past is that this is due to the fact that I'm in "detached HEAD" mode, but how would I have gotten into the rebase in the first place if I was in that mode? I'm most certainly starting in master , then running git rebase --interactive and modifying the git

I'm looking for a good description of what happens if one commits during rebase and how this could be 'reverted' in an easy way. Let's consider a scenario, where a large commit is rebased. During rebase a conflict appears and user begins merging changes. Now, imagine a scenario where you were almost done, but you didn't call git rebase --continue - for whatever reason (be it long weekend or such). The next week you just resumed working, stil during rebase. Finally, you call git commit --amend to append the changes to the last commit and... they end up in the commit you were rebasing into.

I have done some commits and pushed them into my repository. Then I did a pull request but I realized there are some commits I don't want to be in the pull request. They look like this: My commits look like this: Correct HTML ab1c41c HTML escaping 8b38955 Merge branch 'master' into internationalized 2854662 Modified config b942f13 tried pushing b73d792 Added assets f20106e Added config 408118f Fixed views conflicts 86f2509 added layouts da27e11 Fixed layout markup 92d6bcc If I want to get rid of these commits: Modified config b942f13 tried pushing b73d792 Added assets f20106e Added config

I have my feature branch which has exceeded around 30 or more commits. Meanwhile in development branch few other features have been pushed from other developers. Therefore, Everytime a new feature is published on development, I am asked to: Rebase development branch onto my feature branch Resolve conflicts if any Continue developing in your feature branch The problem The second step is the chicken's neck here. On rebasing it gives me conflicts for every commit of that branch. This is really iterative and redundant. Note, I can't always rebase the development branch immediately since my own

Can I squash a range of commits for a local feature/topic branch using rebase that does not include the most recent commit? This is for commits that I want to prepare before they get merged and pushed to a public repo. I was working quickly and made a bunch of minor changes with poor titles and descriptions that I want to squash into two or three separate logical commits with a great comments. Can I select a range of commits between 329aed9 and af39283 that could be at any point in this feature branch's short history? git rebase -i RANGE_START_COMMIT_ID RANGE_LAST_COMMIT_ID Thanks! You could

I've decided to retrospectively commit a history, that was never in Git, from an other old version control system. So I've created an orphan branch "newroot", and imported commits from the other version control system to it. Following question Insert a commit before the root commit in Git? The "newroot" branch ended up with files exactly matching the root commit of the "master" branch. Now I want to rebase the "master" branch onto the "newroot" orphan branch, like: git rebase --onto newroot --root master The problem is that I get prompted to resolve all merge conflicts. There are hundreds of