How to avoid merge commits from Git pull when push

问题:

I have a repository and some local changes to commit. Before committing, I pulled the changes onto my local using Egit in Eclipse.

It creates a merge commit and I submit my commit over it.

Now when I am trying to push to origin, it is showing that it will push my commit as well as merge commit. But ideally, merge commit should not be a part of remote repository.

How to avoid this?

回答1:

Use rebase option whenever you pull from remote repository. Please follow the below steps,

1. Commit your changes - It will create a new commit in your local.
2. Now do git pull --rebase <remote-name> <branch-name>.
3. Basically the rebase take out your commits that you committed on the current branch HEAD as a patch. Then it will apply all the remote commits on top of HEAD and then applies your commits on top of it.
4. So best practice is to commit changes then pull remote commits by using rebase option.

回答2:

When you have uncommitted changes, you can do,

git stash
git pull --rebase <remote> <branch>
git stash pop

回答3:

You can run

git config --global branch.autosetuprebase always

to make git pull --rebase the default behaviour for git pull.

回答4:

The usual strategy is to work on a branch. When the remote master changes, pull the changes to master and instead of merging, rebase the branch.

See Git Rebase at Atlassian.