config/git
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Форматирование

Browse Source
This commit is contained in:
Andrei Astafev 2019-07-17 17:15:48 +03:00
parent 166de8d5ed
commit 302570a5de
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
config
View File

@ -58,10 +58,10 @@
info = cat-file -p info = cat-file -p
# Show commit logs # Show commit logs
logs = !git shortlog --summary | sort --reverse --numeric-sort logs = !git shortlog --summary | sort --reverse --numeric-sort
# Show conflicts # 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 # Show unmerged files
unmerged = !git ls-files --unmerged | cut -f2 | sort -u 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/...` #git branch -D `git for-each-ref --format="%(refname:short)" refs/heads/...`
go = !gitgo go = !gitgo
pushall = !git remote | xargs -L1 git push --all pushall = !git remote | xargs -L1 git push --all
# revert = checkout -- # revert = checkout --
[color] [color]
diff = true diff = true
grep = true grep = true
status = true status = true
ui = true ui = true
[color "branch"] [color "branch"]
current = yellow reverse current = yellow reverse
local = yellow local = yellow
remote = green remote = green
[color "diff"] [color "diff"]
meta = normal meta = normal
@ -124,10 +124,11 @@
[diff] [diff]
renames = copy renames = copy
[log] [log]
decorate = full decorate = full
[push] [push]
default = simple default = simple