rebase

I'm using git and want to change the base of an exiting branch. This is caused by a deployment system, which pulls this explicit branch into my production environment. When planning my releases, I create a tag every time I want to go live. But my branch has special changes too, so git reset --hard v1.0 won't work. Here a small example. I want this C---D---E deploy / A---B---F---G master \ v1.0 to become this C---D---E deploy / A---B---F---G---H---I---J---K master \ \ v1.0 v1.1 Maybe git rebase is what I am looking for, but the man pages don't help me. Thanks for your replies! git rebase should

Starting with hack---F1----M1----F2 (feature) / / C1-----C2----C3 (master) I would like to end up with hack---F1----M1----F2 (feature) / / C1-----C2----C3---F1'---F2' (master) So far the best I have is git checkout feature git checkout -b temp git rebase -i --onto master hack temp * Big drawback: manually remove the merged-in C2 and C3 from list of commits * git checkout master git merge temp git branch -d temp I hope someone can answer even though this is a dubious workflow. jub0bs Simple case If the state of your repo is hack---F1----M1----F2 [feature] / / C1-----C2----C3 [master] and you

Since asking my last question which turned out to be about rebasing with GIT , I have decided that I don't want to rebase at all. Instead I want to: Branch Work work work, checking in and pushing at all times Throw out all of those commits and pretend they never happened (so one clean commit at the end of work) I do this currently by copying the files to a new directory and then copying them back in to a new branch (branched at the same point as my working branch), and then merging that into master or wherever. Is this just plain bad and why? More important: Is there a better/GIT way to do

Everytime I read the git-rebase documentation, I get lost. It feels to me like a kind of a low-level operation (read: dark magic). Quoting the docs: Assume the following history exists and the current branch is "topic": A---B---C topic / D---E---F---G master From this point, the result of either of the following commands: git rebase master git rebase master topic would be: A'--B'--C' topic / D---E---F---G master The question is: Why would anyone want to do such a thing? For one thing, it seems to "re-write" history, as if the branch started at a different point; essentially the commit history

is it possible to rebase a branch with all it's subbranches in git? i often use branches as quick/mutable tags to mark certain commits. * master * * featureA-finished * * origin/master now i want to rebase -i master onto origin/master , to change/reword the commit featureA-finished^ after git rebase -i --onto origin/master origin/master master , i basically want the history to be: * master * * featureA-finished * (changed/reworded) * origin/master but what i get is: * master * * (same changeset as featureA-finished) * (changed/reworded) | * featureA-finished |.* (original commit i wanted to

Normally, when you rebase another author's commit with git, git adds a Commit: header with your name and email address. I have a situation where I don't want this to happen. I want the rebased commit to end up with the same SHA1 as it would have if the original author had done the equivalent rebase him/herself. Is this possible? All git commits have a committer field internally; you can see this by typing git cat-file commit HEAD immediately after committing something. As such you cannot erase it; you can only make it equal to the author field. That said, you might be seeing git porcelain

In my git workflow we have one main repository and one branch, master. Everyone pulls from remote master and everyone pushes to remote master. I want to work in my own branch while I prepare a feature. So far my history is something like this: git pull --rebase git checkout -b new_feature <make some commits> git checkout master git pull --rebase Now I want to merge the branch and here's what I need: No merge commits in my local master branch. All commits made into my new_feature branch merged into master as if I had made them in master. All merged commits to be merged somewhere on top of my

I can pull changes using git pull , but it merges my local commits. Is there a git rebase equivalent with which I can pull in remote changes? Yes you can git pull --rebase . You can also set that to be the default pull behaviour when you track a branch with git config branch.autosetuprebase always . Replace "always" with "remote" or "local" if you want to do it to those specific types of branches that you're tracking. Now all you have to do is git pull . If for some reason you want to do a merge, you can do git pull --no-rebase . Hope this helps. UPDATE: see comments below for how to do this