Форматирование
This commit is contained in:
parent
166de8d5ed
commit
302570a5de
27
config
27
config
@ -58,10 +58,10 @@
|
||||
info = cat-file -p
|
||||
|
||||
# Show commit logs
|
||||
logs = !git shortlog --summary | sort --reverse --numeric-sort
|
||||
logs = !git shortlog --summary | sort --reverse --numeric-sort
|
||||
|
||||
# Show conflicts
|
||||
conflicts = !git ls-files --unmerged | cut -f2 | sort -u | xargs grep -El '<<<<<<<|=======|>>>>>>>'
|
||||
conflicts = !git ls-files --unmerged | cut -f2 | sort -u | xargs grep -El '<<<<<<<|=======|>>>>>>>'
|
||||
|
||||
# Show unmerged files
|
||||
unmerged = !git ls-files --unmerged | cut -f2 | sort -u
|
||||
@ -94,21 +94,21 @@
|
||||
#git branch -D `git for-each-ref --format="%(refname:short)" refs/heads/...`
|
||||
|
||||
go = !gitgo
|
||||
pushall = !git remote | xargs -L1 git push --all
|
||||
pushall = !git remote | xargs -L1 git push --all
|
||||
|
||||
# revert = checkout --
|
||||
|
||||
|
||||
[color]
|
||||
diff = true
|
||||
grep = true
|
||||
status = true
|
||||
ui = true
|
||||
diff = true
|
||||
grep = true
|
||||
status = true
|
||||
ui = true
|
||||
|
||||
[color "branch"]
|
||||
current = yellow reverse
|
||||
local = yellow
|
||||
remote = green
|
||||
current = yellow reverse
|
||||
local = yellow
|
||||
remote = green
|
||||
|
||||
[color "diff"]
|
||||
meta = normal
|
||||
@ -124,10 +124,11 @@
|
||||
|
||||
|
||||
[diff]
|
||||
renames = copy
|
||||
renames = copy
|
||||
|
||||
[log]
|
||||
decorate = full
|
||||
decorate = full
|
||||
|
||||
[push]
|
||||
default = simple
|
||||
default = simple
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user