git-rebase

Originally, I had something like this: C---D (branch1) / A---B (master) Because I needed to work on something else (which was unrelated to branch1 ), I decided to make a new branch (called branch2 ). I made a couple of commits on branch2 and then pushed them. Now, my intention was to have master as a root of branch2 . However, I accidentally did this: E---F--G (branch2) / C---D (branch1) / A---B (master) Is there a clean way to make branch2 stem directly from master , as shown below? E---F--G (branch2) | | C---D (branch1) |/ A---B (master) The ASCII graphs in your question have an uncanny

I recently had to pull a feature out of our 'dev' branch because it's being put on hold until a later date. To do so, I created a branch whose parent is on 'dev' one commit before the first feature commit (the first feature commit was a squashed merge from another branch.) I then cherry-picked all of the feature commits from dev into the new branch. Finally I made one big revert commit on dev to remove those cherry-picked commits. Now I want to rebase the new branch on dev to get it up to date. If I run "git rebase dev", the head of the new branch becomes the big revert, so the feature is lost

I know there are thousands of threads for this question. But I found out something really weird. If you create a project on GitHub, do some commits. Let's say commit 1, 2, 3, 4, 5. Later, you realize you want to change something into commit 3. As you were working in your own branch, no problem to rewrite history. So let's do this: (based on this stackoverflow answer) git rebase --interactive 'bbc643cd^' // Modify 'pick' to 'edit' into interactive prompt and : git commit --all --amend --no-edit git rebase --continue git push -f Great! The mistake is corrected. The history has been rewritten, so

I am doing a rebase of a big change, with a lot of whitespace changes. In order for the merge to work at all, I need -Xignore-all-space. According to git --help rebase: ignore-space-change, ignore-all-space, ignore-space-at-eol Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. See also git-diff(1) -b, -w, and --ignore-space-at-eol. o If their version only introduces whitespace changes to a line, our version is used; o If our version introduces whitespace changes but

In VS2015 all the code metadata from git displayed in the code via the CodeLens functionality regarding the author and changes disappeared after I did git rebase -i and ammended commits to correct the author name (a typo in git configs in one of my machines). The same happened after force pushed the corrected repo and pulled to another machine with different version of IDE - VS2013. In Team Explorer I can see all the relevant information and all the other git intergrations functions work fine as well. What can cause this? What can I do to fix this issue? Seems like the latest updates solves

The following is a scenario I commonly face: You have a set of commits on master or design , that I want to put on top of production branch. I tend to create a new branch with the base as production cherry-pick these commits on it and merge it to production Then when I merge master to production, I face merge conflicts because even tho the changes are same, but are registered as a different commit because of cherry-pick. I have found some workarounds to deal with this, all of which are laborious and can be termed "hacks". Altho' I haven't done too much rebasing, I believe that too creates a