From 5362d39315f5d31cdd16a26ffc106058f968ede7 Mon Sep 17 00:00:00 2001 From: Max Regan Date: Tue, 7 Jul 2020 18:56:13 +0000 Subject: [PATCH] git: add more aliases, fix lazy-checkin for py3.6 --- .gitconfig | 7 ++++++- .mgr_config/bin/git-lazy-checkin | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitconfig b/.gitconfig index e9f7d34..7e7593e 100644 --- a/.gitconfig +++ b/.gitconfig @@ -13,11 +13,16 @@ ca = commit --amend --no-edit rc = rebase --continue ra = rebase --abort + cp = cherry-pick sm = submodule s = status + b = branch + bu = branch --set-upstream-to d = diff ds = diff --staged - g = log --graph --oneline --decorate + graph = log --graph --oneline --decorate + g = graph + ga = graph --all sb = branch -rv --sort=committerdate lc = lazy-checkin [commit] diff --git a/.mgr_config/bin/git-lazy-checkin b/.mgr_config/bin/git-lazy-checkin index 7eebea7..ab0e2a0 100755 --- a/.mgr_config/bin/git-lazy-checkin +++ b/.mgr_config/bin/git-lazy-checkin @@ -2,11 +2,10 @@ import argparse import subprocess -import pathlib def call_proc(cmd): - return subprocess.run(cmd, check=True, capture_output=True) + return subprocess.run(cmd, check=True, stdout=subprocess.PIPE) def lazy_commit(all: bool = True, message: str = None):