mirror of
https://github.com/samsonjs/config.git
synced 2026-04-27 15:07:46 +00:00
Clean up gitconfig transfer flags
This commit is contained in:
parent
9ef9727e05
commit
b3e1dcded4
1 changed files with 2 additions and 9 deletions
11
gitconfig
11
gitconfig
|
|
@ -11,14 +11,13 @@
|
||||||
excludesfile = /Users/sjs/config/gitignore
|
excludesfile = /Users/sjs/config/gitignore
|
||||||
pager = diff-so-fancy | less --tabs=4 -RFX
|
pager = diff-so-fancy | less --tabs=4 -RFX
|
||||||
attributesfile = /Users/work/.gitattributes
|
attributesfile = /Users/work/.gitattributes
|
||||||
[fetch]
|
[transfer]
|
||||||
fsckobjects = true
|
fsckobjects = true
|
||||||
|
[fetch]
|
||||||
prune = true
|
prune = true
|
||||||
[pull]
|
[pull]
|
||||||
ff = only
|
ff = only
|
||||||
rebase = true
|
rebase = true
|
||||||
[receive]
|
|
||||||
fsckobjects = true
|
|
||||||
[push]
|
[push]
|
||||||
autosetupremote = true
|
autosetupremote = true
|
||||||
[commit]
|
[commit]
|
||||||
|
|
@ -42,10 +41,6 @@
|
||||||
autosquash = true
|
autosquash = true
|
||||||
autostash = true
|
autostash = true
|
||||||
updateRefs = true
|
updateRefs = true
|
||||||
[difftool]
|
|
||||||
prompt = false
|
|
||||||
[difftool "FileMerge"]
|
|
||||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
||||||
[interactive]
|
[interactive]
|
||||||
diffFilter = diff-so-fancy --patch
|
diffFilter = diff-so-fancy --patch
|
||||||
[credential]
|
[credential]
|
||||||
|
|
@ -56,8 +51,6 @@
|
||||||
[merge "mergepbx"]
|
[merge "mergepbx"]
|
||||||
name = XCode project files merger
|
name = XCode project files merger
|
||||||
driver = mergepbx %O %A %B
|
driver = mergepbx %O %A %B
|
||||||
[transfer]
|
|
||||||
fsckobjects = true
|
|
||||||
[submodule]
|
[submodule]
|
||||||
fetchJobs = 4
|
fetchJobs = 4
|
||||||
[init]
|
[init]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue