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 +