mirror of
https://github.com/Crocmagnon/dotfiles.git
synced 2024-12-22 05:41:51 +01:00
add git-town config
This commit is contained in:
parent
00495ccacf
commit
f6e6e35d05
1 changed files with 46 additions and 16 deletions
|
@ -49,22 +49,22 @@
|
||||||
restores = restore --staged
|
restores = restore --staged
|
||||||
rmtag = ! "f() { git tag --delete $1; git push --delete origin $1; }; f"
|
rmtag = ! "f() { git tag --delete $1; git push --delete origin $1; }; f"
|
||||||
[commit]
|
[commit]
|
||||||
verbose = true
|
verbose = true
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = nvim
|
||||||
attributesfile = {{ .chezmoi.homeDir }}/.config/git/attributes
|
attributesfile = {{ .chezmoi.homeDir }}/.config/git/attributes
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
[submodule]
|
[submodule]
|
||||||
recurse = true
|
recurse = true
|
||||||
[fetch]
|
[fetch]
|
||||||
prune = true
|
prune = true
|
||||||
prunetags = true
|
prunetags = true
|
||||||
[log]
|
[log]
|
||||||
date = iso
|
date = iso
|
||||||
[status]
|
[status]
|
||||||
submoduleSummary = true
|
submoduleSummary = true
|
||||||
[diff]
|
[diff]
|
||||||
colorMoved = default
|
colorMoved = default
|
||||||
algorithm = histogram
|
algorithm = histogram
|
||||||
|
@ -86,13 +86,13 @@
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
[rebase]
|
[rebase]
|
||||||
autosquash = true
|
autosquash = true
|
||||||
autostash = true
|
autostash = true
|
||||||
updateRefs = true
|
updateRefs = true
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
[branch]
|
[branch]
|
||||||
sort = -committerdate
|
sort = -committerdate
|
||||||
[advice]
|
[advice]
|
||||||
detachedHead = false
|
detachedHead = false
|
||||||
[filter "lfs"]
|
[filter "lfs"]
|
||||||
|
@ -107,13 +107,43 @@
|
||||||
sort = version:refname
|
sort = version:refname
|
||||||
|
|
||||||
[url "git@github.com:"]
|
[url "git@github.com:"]
|
||||||
insteadOf = "https://github.com/"
|
insteadOf = "https://github.com/"
|
||||||
insteadOf = "gh:"
|
insteadOf = "gh:"
|
||||||
|
|
||||||
[credential]
|
[credential]
|
||||||
helper = osxkeychain
|
helper = osxkeychain
|
||||||
|
|
||||||
[include]
|
[include]
|
||||||
path = host.config
|
path = host.config
|
||||||
path = sendemail
|
path = sendemail
|
||||||
|
|
||||||
|
# git-town aliases & config
|
||||||
|
# https://www.git-town.com
|
||||||
|
[alias]
|
||||||
|
append = town append
|
||||||
|
compress = town compress
|
||||||
|
contribute = town contribute
|
||||||
|
diff-parent = town diff-parent
|
||||||
|
hack = town hack
|
||||||
|
delete = town delete
|
||||||
|
observe = town observe
|
||||||
|
park = town park
|
||||||
|
prepend = town prepend
|
||||||
|
propose = town propose
|
||||||
|
rename = town rename
|
||||||
|
repo = town repo
|
||||||
|
set-parent = town set-parent
|
||||||
|
ship = town ship
|
||||||
|
sync = town sync
|
||||||
|
|
||||||
|
[git-town]
|
||||||
|
push-hook = true
|
||||||
|
push-new-branches = false
|
||||||
|
create-prototype-branches = false
|
||||||
|
ship-strategy = api
|
||||||
|
ship-delete-tracking-branch = false
|
||||||
|
sync-tags = true
|
||||||
|
sync-upstream = true
|
||||||
|
perennial-branches = master
|
||||||
|
sync-feature-strategy = rebase
|
||||||
|
sync-perennial-strategy = rebase
|
||||||
|
|
Loading…
Reference in a new issue