80
80

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?

More than 5 years have passed since last update.

git merge で常に --no-ff

Last updated at Posted at 2012-12-26
# 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
80
80
0

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
80
80

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?