forked from mathiasbynens/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
118 lines (109 loc) · 4.45 KB
/
.gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
[alias]
# View the SHA, description, and history graph
l = log --pretty=oneline --graph
# View SHA, description, relative date, and committer
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
# View SHA, description, absolute date, and committer
ld = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd) %C(bold blue)<%an>%Creset' --abbrev-commit --date=local
# View the current working tree status using the short format
s = status -s
# Show the diff between the latest commit and the current state
d = !"git diff-index --quiet HEAD -- || clear; git diff --patch-with-stat"
# `git di $number` shows the diff between the state `$number` revisions ago and the current state
di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
# Clone a repository including all submodules
c = clone --recursive
# Commit all changes
ca = !git add -A && git commit -av
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
# Show local-only (no remotes) branches
localbranches = "!git for-each-ref --format=\"%(refname:short) %(upstream)\" refs/heads | grep -v 'refs\\/remotes'"
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
# Interactive rebase with the given number of latest commits
reb = "!r() { git rebase -i HEAD~$1; }; r"
# Show files changed in a given commit
files = "!f() { git diff-tree --no-commit-id --name-status -r ${1-HEAD} | cut -c 3-; }; f"
# Show files changed between current HEAD and main
branchfiles = "!f() { git diff-tree --no-commit-id --name-status -r HEAD..origin/main | cut -c 3-; }; f"
# Fetch all
fa = fetch --all
# Fetch origin
fo = fetch origin
# Fetch upstream
fu = fetch upstream
# Pull, only accepting fast-forwardable merges
pff = pull --ff-only
# Unstage and discard changes
dump = "!d() { git reset HEAD $1 && git checkout -- $1; }; d"
# Stash all the things before checking out
co = "!sh -c 'git stash; git stash apply; git checkout \"$*\"'"
# List branches by last modified
latest = for-each-ref --sort=-committerdate refs/heads/ --format="%(authordate:short)%09%(objectname:short)%09%1B[0;33m%(refname:short)%1B[m%09"
# Pull in remote changes and do a fast-forward-only merge of the current branch
up = "!git remote update -p; git merge --ff-only @{u}"
# Search all the things
spelunk = "!s() { git grep $1 $(git rev-list --all); }; s"
# Search dem messages
logg = "!s() { git log --grep=$1; }; s"
# Start fresh
starty = "!f() { git checkout main && git pull --rebase origin main && git remote prune origin && git localbranches | xargs git branch -d; }; f"
[apply]
# Detect whitespace errors when applying a patch
whitespace = fix
[core]
# Use custom `.gitignore` and `.gitattributes`
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
# Treat spaces before tabs, lines that are indented with 8 or more spaces, and all kinds of trailing whitespace as an error
whitespace = space-before-tab,trailing-space
autocrlf = input
[color]
# Use colors in Git commands that are capable of colored output when outputting to the terminal
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[credential]
helper = osxkeychain
[push]
default = current
[merge]
# Include summaries of merged commits in newly created merge commit messages
log = true
tool = meld
# Use `origin` as the default remote on the `main` branch in all cases
[branch "main"]
remote = origin
merge = refs/heads/main
# URL shorthands
[url "[email protected]:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "[email protected]:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
# Include sensitive config
[include]
path = ./.gituser
[init]
defaultBranch = main