summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2013-07-22 02:01:56 -0400
committerJesse Luehrs <doy@tozt.net>2013-07-22 02:03:35 -0400
commit5a6ff7a2052ff7a8b5fa204a70d6ad2a56f85cb1 (patch)
tree976b02a12dc5c56458119144e9e372570455909d
parent6f446ef41c50e6009d486e50deba87581ec2edca (diff)
downloadconf-5a6ff7a2052ff7a8b5fa204a70d6ad2a56f85cb1.tar.gz
conf-5a6ff7a2052ff7a8b5fa204a70d6ad2a56f85cb1.zip
use the author date here, not the commit date
-rw-r--r--gitconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitconfig b/gitconfig
index 8bf7865..33e438e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -15,8 +15,8 @@
prune-all = !git remote | xargs -n 1 git remote prune
alias = "!f() { local name=$1; shift; git config --global alias.$name \"$*\"; }; f"
aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
- lg = log --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %C(bold blue)%an %Cgreen(%cr)%Creset%n%s%n' --abbrev-commit --date=relative --stat=72
- lgs = log --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %C(bold blue)%an %Cgreen(%cr)%Creset%n%s%n' --abbrev-commit --date=relative
+ lg = log --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %C(bold blue)%aN %Cgreen(%ar)%Creset%n%s%n' --abbrev-commit --date=relative --stat=72
+ lgs = log --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %C(bold blue)%aN %Cgreen(%ar)%Creset%n%s%n' --abbrev-commit --date=relative
st = status -sb
ch = "!f() { git cherry \"$@\" | grep -v '^-' | sed 's/^..//' | xargs -n1 git log --oneline -1 | cat | perl -ple 's/([^ ]+)/\\e[33m$1\\e[m/'; }; f"
ff = merge --ff-only