src
/
shellrc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

git: --ff by default

Maxim Likhachev 5 years ago
parent
eba3eaad1d
commit
cdda1bd20d
1 changed files with 3 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      etc/soft/git/gitconfig

3
etc/soft/git/gitconfig
Unescape View File

@ -17,6 +17,9 @@
[color] [color]
ui = true ui = true
[pull]
ff = only
[merge] [merge]
tool = vimdiff tool = vimdiff

Write Preview
Loading…
Cancel
Save