1
0
Fork 0
mirror of https://github.com/hcartiaux/dotfiles.git synced 2024-10-18 09:15:24 +02:00

[git] Fix indentation in gitconfig

This commit is contained in:
Hyacinthe Cartiaux 2020-06-12 10:33:58 +02:00
parent 76a38e2128
commit 92aeb74350

View file

@ -18,77 +18,77 @@
# - https://github.com/Falkor/dotfiles
[includeIf "gitdir:~/"]
path = .gitconfig-personal
path = .gitconfig-personal
[includeIf "gitdir:~/repos/work/"]
path = .gitconfig-work
path = .gitconfig-work
[includeIf "gitdir:~/git/"]
path = .gitconfig-work
path = .gitconfig-work
[alias]
up = pull origin
pu = push origin
st = status
df = diff
ci = commit
br = branch
w = whatchanged --abbrev-commit
ls = ls-files
gr = log --graph --oneline --decorate
lol = log --graph --pretty=format:'%C(yellow)%h%Creset%C(cyan)%C(bold)%d%Creset %C(cyan)(%cd)%Creset %C(green)%cn%Creset %s' --date=format:'%Y-%m-%d %H:%M:%S'
unstage = reset HEAD --
last = log -1 HEAD
amend = commit --amend
undo-commit = reset --soft HEAD^
# From http://j.shirley.im/tech/git-flow/
feature-start = !git flow feature start $1
feature-finish = !git flow feature finish $1 && git push
# fs, feature start
fs = !git flow feature start $1 && grb publish feature/$1
# ff, feature finish. Always push to the final branch (remote)
# if it was successful
ff = !git flow feature finish $1 && git push
up = pull origin
pu = push origin
st = status
df = diff
ci = commit
r = branch
w = whatchanged --abbrev-commit
ls = ls-files
gr = log --graph --oneline --decorate
lol = log --graph --pretty=format:'%C(yellow)%h%Creset%C(cyan)%C(bold)%d%Creset %C(cyan)(%cd)%Creset %C(green)%cn%Creset %s' --date=format:'%Y-%m-%d %H:%M:%S'
unstage = reset HEAD --
last = log -1 HEAD
amend = commit --amend
undo-commit = reset --soft HEAD^
# From http://j.shirley.im/tech/git-flow/
feature-start = !git flow feature start $1
feature-finish = !git flow feature finish $1 && git push
# fs, feature start
fs = !git flow feature start $1 && grb publish feature/$1
# ff, feature finish. Always push to the final branch (remote)
# if it was successful
ff = !git flow feature finish $1 && git push
[color]
ui = true
diff = auto
status = auto
branch = auto
ui = true
diff = auto
status = auto
branch = auto
[color "branch"]
current = yellow reverse
local = green
remote = red
current = yellow reverse
local = green
remote = red
[color "diff"]
meta = yellow bold
meta = yellow bold
[color "status"]
added = magenta bold
changed = green
untracked = red
added = magenta bold
changed = green
untracked = red
[core]
autocrlf = false
pager = less -FiRSwX
editor = vim
mergeoptions = --no-edit
autocrlf = false
pager = less -FiRSwX
editor = vim
mergeoptions = --no-edit
[merge]
tool = vimdiff
conflictstyle = diff3
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false
prompt = false
[http]
sslverify = false
[push]
default = matching
default = matching
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process