rebase

I'm pulling from a repository that only I have access to. As far as I know, I've only pushed to it from one repository. A couple of times, I've tried pushing to it and gotten this: To jbaker@192.168.2.216:tsched_dev.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'jbaker@192.168.2.216:tsched_dev.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. Generally, that just means that I have to do a git pull

I have a topic branch that looks like this. (the branch topic currently points at 'a0a0') a0a0 Merge branch 'Master' into topic b1b1 Merge Branch 'Master' into topic c2c2 Merge commit 'something from master' into topic d3d3 Merge Branch 'Master' into topic e4e4 Merge Branch 'Master' into topic f5f5 Merge Branch 'Master' into topic 6666 an actual commit [lots of history on the topic branch] 9999 original divergence point How do I turn a0-f5 into a single merge commit? I've tried: git rebase -i f5f5 with the intention of telling it to squash those 5 commits, but instead it just gave every commit

I know how to remove a specific commit from the git history with git rebase --interactive . My question concerns the more complex case with a history like this: A--X--B--C--D \ E--F where I would like to remove the commit X . The issue is that in this case there are two or more branches with parents ( B in this case) that have X in their history, so a single git rebase -i will not do the trick (at least I do not know how). Is there a simple way to remove X , or do I have to rely on rebasing all branches on their own, possibly with a shell script? Unfortunately Git doesn't make it easy in this

I'm in the middle of an interactive rebase. Is there a command that shows the list of commits that were initially selected when I started the rebase? During the interactive rebase, git updates files in your .git directory under the sub-directory rebase-merge (the exact path has changed in various versions of git, as I recall; I'm looking at git 2.0.x behavior right now). In that directory are the files done and git-rebase-todo . These are not quite what you asked for: they're the finished parts and the not-yet-done parts, not the "pick" commands that were presented to you initially, nor

I have a local branch ( CRM-ayrshireminis ) that has a couple of commits on it that I have pushed to the origin ( origin/CRM-ayrshireminis ). This branch was created from the develop branch about one week ago, on which there have been one weeks worth of work from other collaborators. What I want to do is rebase the latest code from origin/develop into my feature branch CRM-ayrshireminis . What I done was: git checkout develop git pull git rebase -i develop CRM-ayrshireminis I had two commits, so I squashed them into one and then quit out. I got the message saying Rebasing (2/2) , so it seemed