Last active
August 29, 2015 14:05
-
-
Save NathanW2/39562fb8e3a8c365b431 to your computer and use it in GitHub Desktop.
.gitconfig
This file contains 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
[core] | |
autocrlf = true | |
[alias] | |
st = status -s | |
ci = commit | |
br = branch | |
co = checkout | |
amend = commit --amend | |
aa = add --all | |
ac = add -u | |
df = diff | |
dfc = diff --cached | |
lg = log -p | |
last = log --oneline -n1 | |
update = pull --rebase origin master | |
comp = log origin/master.. --oneline --stat | |
# 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 r -1 | |
h = !git head | |
hp = "!. ~/.githelpers && show_git_head" | |
r = !GIT_NO_PAGER=1 git l -30 | |
ra = !git r --all | |
l = "!. ~/.githelpers && pretty_git_log" | |
la = !git l --all | |
alias = config --global alias. | |
stat = log --stat | |
[diff] | |
[color] | |
ui = auto |
This file contains 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(bold red)%d%Creset" | |
SUBJECT="%s" | |
FORMAT="$HASH $RELATIVE_TIME $AUTHOR $REFS $SUBJECT" | |
ANSI_BLACK='\033[30m' | |
ANSI_BLACK_BOLD='\033[0;30;1m' | |
ANSI_RED='\033[31m' | |
ANSI_RED_BOLD='\033[0;31;1m' | |
ANSI_GREEN='\033[32m' | |
ANSI_GREEN_BOLD='\033[0;32;1m' | |
ANSI_YELLOW='\033[33m' | |
ANSI_YELLOW_BOLD='\033[0;33;1m' | |
ANSI_BLUE='\033[34m' | |
ANSI_BLUE_BOLD='\033[0;34;1m' | |
ANSI_MAGENTA='\033[35m' | |
ANSI_MAGENTA_BOLD='\033[0;35;1m' | |
ANSI_CYAN='\033[36m' | |
ANSI_CYAN_BOLD='\033[0;36;1m' | |
ANSI_WHITE='\033[37m' | |
ANSI_WHITE_BOLD='\033[0;37;1m' | |
ANSI_RESET='\033[0m' | |
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 | | |
# Color merge commits specially | |
sed -Ee "s/(Merge (branch|remote-tracking branch|pull request) .*$)/$(printf $ANSI_RED)\1$(printf $ANSI_RESET)/" | | |
# Page only if we're asked to. | |
if [ -n "$GIT_NO_PAGER" ]; then | |
cat | |
else | |
# Page only if needed. | |
less --quit-if-one-screen --no-init --RAW-CONTROL-CHARS --chop-long-lines | |
fi | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment