Last active
October 14, 2021 03:46
-
-
Save sebastorama/5051884 to your computer and use it in GitHub Desktop.
Gitconfig #git #dev
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = Sebastião Ferreira, Jr | |
email = [email protected] | |
username = sebastorama | |
[core] | |
editor = vim | |
autocrlf = true | |
whitespace = trailing-space | |
[diff] | |
[color] | |
ui = auto | |
[alias] | |
st = status -s | |
ci = commit | |
co = checkout | |
di = diff | |
dc = diff --cached | |
amend = commit --amend | |
aa = add --all | |
ff = merge --ff-only | |
pullff = pull --ff-only | |
noff = merge --no-ff | |
fa = fetch --all | |
pom = push origin master | |
b = branch | |
ds = diff --stat=160,120 | |
dh1 = diff HEAD~1 | |
# Divergence (commits we added and commits remote added) | |
div = divergence | |
# Goodness (summary of diff lines added/removed/total) | |
gn = goodness | |
gnc = goodness --cached | |
# Fancy logging. | |
# h = head | |
# hp = head with patch | |
# r = recent commits, only current branch | |
# ra = recent commits, all reachable refs | |
# l = all commits, only current branch | |
# la = all commits, all reachable refs | |
head = !git l -1 | |
h = !git head | |
hp = "!source ~/.githelpers && show_git_head" | |
r = !git l -30 | |
ra = !git r --all | |
l = "!source ~/.githelpers && pretty_git_log" | |
la = !git l --all | |
[merge] | |
tool = vimdiff |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# Log output: | |
# | |
# * 51c333e (12 days) <Gary Bernhardt> add vim-eunuch | |
# | |
# The time massaging regexes start with ^[^<]* because that ensures that they | |
# only operate before the first "<". That "<" will be the beginning of the | |
# author name, ensuring that we don't destroy anything in the commit message | |
# that looks like time. | |
# | |
# The log format uses } characters between each field, and `column` is later | |
# used to split on them. A } in the commit subject or any other field will | |
# break this. | |
HASH="%C(yellow)%h%Creset" | |
RELATIVE_TIME="%Cgreen(%ar)%Creset" | |
AUTHOR="%C(bold blue)<%an>%Creset" | |
REFS="%C(red)%d%Creset" | |
SUBJECT="%s" | |
FORMAT="$HASH}$RELATIVE_TIME}$AUTHOR}$REFS $SUBJECT" | |
show_git_head() { | |
pretty_git_log -1 | |
git show -p --pretty="tformat:" | |
} | |
pretty_git_log() { | |
git log --graph --pretty="tformat:${FORMAT}" $* | | |
# Replace (2 years ago) with (2 years) | |
sed -Ee 's/(^[^<]*) ago)/\1)/' | | |
# Replace (2 years, 5 months) with (2 years) | |
sed -Ee 's/(^[^<]*), [[:digit:]]+ .*months?)/\1)/' | | |
# Line columns up based on } delimiter | |
column -s '}' -t | | |
# Page only if we need to | |
less -FXRS | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment