From 00f0b48aa55ca1a8a80a5617ee39c1d254584698 Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Sun, 20 Feb 2022 21:17:09 -0500 Subject: [PATCH] Clean up git log format styles --- gitconfig | 79 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/gitconfig b/gitconfig index dec6db7..73de77e 100644 --- a/gitconfig +++ b/gitconfig @@ -45,46 +45,47 @@ required = true process = git-lfs filter-process [alias] - # Note: I'm using %ad in the pretty log to see the author's timestamp, as - # opposed to %cr which is the commiter's timestamp. I prefer the former - # because I sometimes edit an earlier commit message while rebasing and I - # want to continue to see the original date. - # - # @note If you want a grey that's slightly darker than %C(white dim) then - # try %C(black bold). - # - - # Style 1 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h %Creset%C(white dim)[%Creset%an%Creset%C(white dim)]%Creset%C(yellow bold)%d %Creset%C(white bold)%s %C(white dim)<%ad|%cr>%Creset' - - # Style 2 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h [%Creset%an%Creset%C(yellow bold)]%d %Creset%C(white bold)%s %C(white dim)<%ad|%cr>%Creset' - - # Style 3 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h %Creset<%an> %C(yellow bold)%d %Creset%C(white bold)%s %C(white dim)<%ad|%cr>%Creset' - - # Style 4 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h %Creset[%an] %C(yellow bold)|%d %Creset%C(white bold)%s %C(white dim)<%ad|%cr>%Creset' - - # Style 5 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h|%Creset%an%Creset%C(yellow bold)|%d %Creset%C(white bold)%s %C(white dim)<%ad|%cr>%Creset' - - # Style 6 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h|%Creset%C(yellow dim)%an%Creset%C(yellow bold)|%d %Creset%C(white bold)%s %C(white dim)<%ad|%cr>%Creset' - - # Style 7 - lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h %Creset%C(yellow dim)%an %Creset%C(yellow bold)| %Creset%C(white bold)%s %C(white dim)[%ad|%cr] %Creset%C(yellow bold)%d %C(cyan bold)%<(8,trunc)%GK%Creset' - - # Style 8 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h%Creset%C(white dim)|%Creset%an%Creset%C(white dim) >%Creset%C(yellow bold)%d %Creset%C(white bold)%s %C(white dim)<%ad|%cr>%Creset' - - # Style 9 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h%C(black bold)|%C(white dim)%an%Creset%C(yellow bold) >%d %Creset%C(white bold)%s %C(black bold)<%ad|%cr>%Creset' - - # Style 10 - #lg = log --graph --date=relative --pretty=format:'%C(yellow bold)%h %Creset%C(yellow dim)%an%Creset%C(yellow bold) >%d %Creset%C(white bold)%s %C(white dim)<%ad|%cr>%Creset' - start = !git init && git commit --allow-empty -m \"Initial commit\" + + #################### + # Logging + #################### + + # Note: There are two timestamp values in the log. The first (%ad) is the author's timestamp + # and the second (%ci, %cs, %cr, etc) is the committer's timestamp. This lets you see the + # original commit date and the last time the commit sha changed from a history modification + # operation, e.g. modifying a commit in a rebase. + + # Note: If you want a grey that's slightly darker than %C(white dim) then try `%C(black bold)`. + + # Preferred style: + # * Good for history with merge commits. + # * Dates are YYYY-MM-DD format. + # * Can also use: --date=relative and replace %ci with %cr + # --date=iso and replace %ci with %ci + lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%C(yellow dim)%an %Creset%C(yellow bold)| %Creset%C(white bold)%s %C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + + # Good for flat history: + # lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%C(yellow dim)%an %Creset%C(yellow bold)| %Creset%C(white bold)%<(78,trunc)%s %C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + + # Alternative styles: + + # name | msg + #lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%an %C(white dim)| %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + #lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%an %C(yellow bold)| %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + + # name > msg + #lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%an %C(yellow bold)>%Creset %C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + #lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %C(white dim)%an %Creset%C(yellow bold)> %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + #lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%C(yellow dim)%an %Creset%C(yellow bold)> %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + + # msg + #lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset<%an> %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + + # [name] msg + #lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%C(white dim)[%Creset%an%Creset%C(white dim)] %Creset%C(white bold)%s %C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset' + + [rerere] enabled = true [gc]