jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update git alias

Browse source
This commit is contained in:
Jakobus Schürz 2021-09-11 23:34:28 +02:00
parent a19afef6b2
commit f0769c0f07
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitconfig
View file

@ -35,15 +35,13 @@
sdiff = !"git diff && git submodule foreach 'git diff'" sdiff = !"git diff && git submodule foreach 'git diff'"
spush = push --recurse-submodules=on-demand spush = push --recurse-submodules=on-demand
supdate = submodule update --remote --merge supdate = submodule update --remote --merge
pushup = "!gitbranchname() { git symbolic-ref --short HEAD; }; gitpushupstream() { git push --set-upstream origin `gitbranchname`; }; gitpushupstream"
permission-reset = !git diff -p -R --no-ext-diff --no-color | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply
[merge] [merge]
conflictstyle = diff3 conflictstyle = diff3
tool = vimdiff tool = vimdiff
[mergetool] [mergetool]
prompt = false prompt = false
[alias]
pushup = "!gitbranchname() { git symbolic-ref --short HEAD; }; gitpushupstream() { git push --set-upstream origin `gitbranchname`; }; gitpushupstream"
[include] [include]
path = ~/.gitconfig_local path = ~/.gitconfig_local
[status] [status]