-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
78 lines (72 loc) · 1.75 KB
/
gitconfig
File metadata and controls
78 lines (72 loc) · 1.75 KB
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
# This is Git's per-user configuration file.
[core]
editor = /usr/bin/vim
excludesfile = /Users/elle/.gitignore_global
[user]
name = Elle Meredith
email = elle@aemeredith.com
[alias]
st = status
ci = commit
br = branch
co = checkout
# `git log` with patches shown with difftastic.
# dl = -c diff.external=difft log --ext-diff
# Show most recent commit with difft
# ds = -c diff.external=difft show --ext-diff
# git diff` with difftastic
# dft = -c diff.external=difft diff
# diff
d = diff
last = diff HEAD^ # diff last committed change
# log
l = = log --oneline --decorate
lol = log --graph --decorate --pretty=oneline --abbrev-commit
simple = log --pretty=format:\" * %s\"
# reset
unstage = reset HEAD # remove files from index (tracking)
uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state
ls = ls-files
cleanup = !git remote prune origin && git gc && git clean -df && git stash clear
# Assume a file as unchanged:
assume = update-index --assume-unchanged
# Unassume a file:
unassume = update-index --no-assume-unchanged
# Show assumed files:
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
# force push with lease
pushf = push --force-with-lease
[color]
diff = auto
status = auto
branch = auto
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "status"]
added = green
changed = yellow
untracked = cyan
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[commit]
verbose = true
[diff]
noprefix = true
[fetch]
prune = true
[merge]
ff = only
[push]
default = simple
[rebase]
autosquash = true
[pull]
rebase = false
[init]
defaultBranch = main