diff --git a/gitconfig b/gitconfig index b33d724..79d8809 100644 --- a/gitconfig +++ b/gitconfig @@ -15,11 +15,12 @@ pending = !git --no-pager log origin/master..master && echo db = !sh -c 'git branch -D "$0" && git push origin ":$0"' &> /dev/null missing = !sh -c 'git cherry "$0" | cut -sd + -f 2 | xargs "git show"' - lc = log ORIG_HEAD.. --stat --no-merges - conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR - resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add + lc = log ORIG_HEAD.. --stat --no-merges + conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR + resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add + subadd = !sh -c 'git submodule add $(git config -f"$0".git/config remote.origin.url) "$0"' [format] - # pretty = format:"%Cblue%ar%Creset\t%s" + # pretty = format:"%Cblue%ar%Creset\t%s" [color] diff = auto status = auto