git-squash

I want to squash several commits together in the middle of a branch without modifying the commits before and after. I have : A -- B -- C -- D -- E -- F -- G | | master dev origin/master I want to squash that into A -- H -- E -- F -- G | | master dev origin/master Where H is equivalent to B -- C -- D . And I want to be able to specify the commit message of H . A is the last commit that has been pushed so all commits after that can be rewritten without messing up the server. The idea is to clean up the history before I fast forward master . How can I do that ? PS: Note that in my case I actually

while I am working on new code I make many small commits to track my changes. My company however prefers each feature to be committed in a single commit. So the solution is to squash my entire branch down to a single commit. How do I squash an entire branch without using git rebase --interactive and then changing pick to squash for all the commits? meagar My preferred method is a two-liner (excluding steps 1 and 4 below). The benefits are you do not need to know/record any commit IDs, you can write a simple alias to perform all the steps involved, and your actually moving your entire branch

I've got eight commits on a branch that I'd like to email to some people who aren't git enlightened, yet. So far, everything I do either gives me 8 patch files, or starts giving me patch files for every commit in the branch's history, since the beginning of time. I used git rebase --interactive to squash the commits, but now everything I try gives me zillions of patches from the beginning of time. What am I doing wrong? git format-patch master HEAD # yields zillions of patches, even though there's # only one commit since master I'd recommend doing this on a throwaway branch as follows. If your

This question already has an answer here: Squash my last X commits together using Git 31 answers I have a bunch of commits on my local repository which are thematically similar. I'd like to combine them into a single commit before pushing up to a remote. How do I do it? I think rebase does this, but I can't make sense of the docs. Leopd What you want to do is referred to as "squashing" in git. There are lots of options when you're doing this (too many?) but if you just want to merge all of your unpushed commits into a single commit, do this: git rebase -i origin/master This will bring up your