Qiita Teams that are logged in
You are not logged in to any team

Log in to Qiita Team
Community
OrganizationEventAdvent CalendarQiitadon (β)
Service
Qiita JobsQiita ZineQiita Blog
81
Help us understand the problem. What is going on with this article?

More than 5 years have passed since last update.

@ponko2

git merge で常に --no-ff

# master 上で git merge するときは常に --no-ff
git config branch.master.mergeoptions "--no-ff"
# git merge するときは常に --no-ff(1.7.6以降)
git config --global merge.ff false

## あわせて設定しておくと吉
# master 上で git pull するときは常に rebase
git config branch.master.rebase true
# git pull するときは常に rebase(1.7.9以降)
git config --global pull.rebase true
# git pull するときは常に rebase(1.8.5以降)
git config --global pull.rebase preserve
81
Help us understand the problem. What is going on with this article?
Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
81
Help us understand the problem. What is going on with this article?