From 302570a5deb00a979b9d9640e95d751d5aa87dc1 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 17 Jul 2019 17:15:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/config b/config index 70a6462..baabcf8 100644 --- a/config +++ b/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 +