-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
31 lines (31 loc) · 1.25 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
[user]
name = Joedang
email = [email protected]
signingkey = 5892B7FC2FBFB981 # which GPG key to use when signing tags and commits
[credential]
helper = cache --timeout=3600
[push]
default = simple # by default, push the current branch to the same-name upstream branch
[core]
editor = vim
[merge]
tool = vimdiff # use this program to manage merges
conflictstyle = diff3 # also show the original text before both changes
[alias] # these basically become new git subcommands
# print the root of the git repo:
home = !pwd
# display a colorful graph of the history:
gr = log --graph --full-history --all --color --format='%C(auto)%h %an (%G?) %C(green)%ci%C(auto)%d%n%s%n'
# Display all the commits that went into a file:
# Also show which files were changed in those commits.
# Adding the --all flag makes this like the `gr` alias, but with which files were changed.
gr-ch = log --graph --full-history -M --name-status --color --format='───╮%n%C(auto)%h %an (%G?) %C(green)%ci%C(auto)%d%n%B'
sta = status # lazy alias
k = !gitk --all # run the gitk tool on the whole history
vimdiff = difftool --tool=vimdiff # lazy alias
mt = mergetool # lazy alias
wdiff = diff --word-diff=plain
[pull]
rebase = false
[init]
defaultBranch = main