Git branch diff进入一个新的提交

Question

So let's say I have a main branch, we'll call 'master'. I've made a branch, called 'new-feature'. I've made a ton of commits in this branch so I can go back in time, but I've done quite a bit of back and forth on while developing the feature so the commit log is pretty messy.

If I were to look at git diff master..new-feature for example.

If I wanted to create just one new fresh commit on 'master' that includes all the changes in between the two branches, what's the most efficient way to do that?

Answer 1

git checkout master
git merge --squash new-feature
git commit

The commit message will start out showing the entire list of commits being merged/squashed, but you can of course edit that to be whatever you want.

Answer 2

Another option that might work better for you, would be to generate a patch file with git diff --patch > "patch filename" and then patch them into your master branch using git apply "patch file name" .

Man page for git-diff (especially "Generating patches with -p"): http://www.kernel.org/pub/software/scm/git/docs/git-diff.html

Man page for git-apply: http://www.kernel.org/pub/software/scm/git/docs/git-apply.html

Answer 3

You can use interactive rebase for this: git rebase --interactive . Then just use the squash option. It only uses the updates from the commit but doesn't create the commit.

Answer 4

Use git rebase --interactive HEAD~(however many commits to want to squash). eg, git rebase --interactive HEAD~5. This will load your last 5 commits and bring up an editor window with the messages. Each message will have 'pick' at the beginning. Go down to the last message, change 'pick' to 'squash' and exit. A new window will open asking for a commit message. This will be the new commit message of the squash commits. Exit and it will squash all the commits into one new one.

There's an example here: https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one

Answer 5

You could commit everything in your feature branch, then merge into master accepting 'theirs' for all changes.

Here's a Stack Overflow question with a great answer on how to do that: Is there a "theirs" version of "git merge -s ours"?