Git merge flattening

git git-pull git-push git-merge
Verhogen picture Verhogen · Apr 24, 2009 · Viewed 39.1k times · Source

If I am working in multiple branches on a single feature, I use git pull branch1 branch2 branch3 to pull all the changes into my master branch. However, all the commit logs of each branch are copied as well. How do I flatten the commit log down to a single message?

Answer

Jakub Narębski picture Jakub Narębski · Apr 24, 2009

"git merge --squash" (after "git fetch"; "git pull" is just fetch+merge, pehaps it also allows --squash option) might be what you want.

From git-merge(1):

--squash

Produce the working tree and index state as if a real merge happened, but do not actually make a commit or move the HEAD, nor record $GIT_DIR/MERGE_HEAD to cause the next git commit command to create a merge commit. This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus).

Related questions

git push rejected: error: failed to push some refs

I know people have asked similar questions, but I believe the causes of their problems to be different. I did a hard reset because I had messed up my code pretty bad git reset --hard 41651df8fc9 I've made quite …

Read More
Push branches to Git

I have a local repository I'm working on and its remote is hosted on GitHub. I recently created a branch and started working on it, making several commits and now wish to push the branch to GitHub and be able …

Read More
pull remote branch without merge

I've created a branch b1 and I made some changes on it and I push it to the remote repository: git branch b1 git checkout b1 git add newfile.txt git commit -m "adding a new file" git push origin …

Read More