-
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdot_gitconfig.tmpl
225 lines (201 loc) · 14.3 KB
/
dot_gitconfig.tmpl
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
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
[branch "main"]
merge = main
[init]
defaultBranch = main
[color]
# Use colors in Git commands that are capable of colored output when
# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = yellow
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[commit]
# https://help.github.com/articles/signing-commits-using-gpg/
gpgsign = true
template = ~/.gitmessage
[gpg]
program = {{ .gpg | quote }}
[core]
excludesfile = ~/.gitignore
editor = /usr/bin/vim
[user]
name = {{ .name | quote }}
email = {{ .email | quote }}
[alias]
a = add # Add file contents to the index
ap = add -p # Add Patch : This gives the user a chance to review the difference before adding modified contents to the index.
ai = add --interactive # Add modified contents in the working tree interactively to the index.
##############
b = branch
ba = branch --all # List both remote-tracking branches and local branches.
bav = branch --all --verbose # When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any)
bd = branch --delete # Delete a branch. The branch must be fully merged in its upstream branch, or in HEAD if no upstream was set with --track or --set-upstream-to.
bdd = branch -D # Shortcut for --delete --force.
bm = branch --move # Move/rename a branch and the corresponding reflog.
bmm = branch -M # Shortcut for --move --force.
br = branch --remotes # List or delete (if used with -d) the remote-tracking branches.
##############
c = commit --signoff -S # Record changes to the repository
ca = commit --all -S--signoff # Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected.
cm = commit --signoff -S -m # Use the given <msg> as the commit message.
cam = commit --signoff -S -am # Shortcut for --all and -m
cem = commit --signoff --allow-empty -m # Allows to create a commit without any files modified
cd = commit --amend # Replace the tip of the current branch by creating a new commit.
cad = commit --all --amend # Shortcut for --amend and --all
cadne = commit --all --amend --no-edit # Amends a commit without changing its commit message.
##############
cl = clone # Clone a repository into a new directory
cld = clone --depth 1 # Create a shallow clone with a history truncated to the specified number of commits.
##############
cp = cherry-pick # Apply the changes introduced by some existing commits
cpa = cherry-pick --abort # Cancel the operation and return to the pre-sequence state.
cpc = cherry-pick --continue # Continue the operation in progress using the information in .git/sequencer. Can be used to continue after resolving conflicts in a failed cherry-pick or revert.
cps = cherry-pick --skip # Skip the current commit and continue with the rest of the sequence.
##############
d = diff # Show changes between commits, commit and working tree, etc
di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d" # `git di $number` shows the diff between the state `$number` revisions ago and the current state
dt = difftool # Show changes using common diff tools
##############
f = fetch # Download objects and refs from another repository
fo = fetch origin # Update the remote-tracking branches
fu = fetch upstream # Fetch the branches and their respective commits from the upstream repository.
##############
fk = fsck # Verifies the connectivity and validity of the objects in the database
##############
g = grep -p # Print lines matching a pattern
##############
l = log --oneline # Show commit logs, the commit message is prefixed with this information on the same line.
lg = log --oneline --graph --decorate # Draw a text-based graphical representation of the commit history on the left hand side of the output.
lgs = !"git log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short" # SHA + date + Commit message + author
lgc = !"git log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat" # SHA + Commit message + author + changed files
lgt = !"git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all" # As tree: SHA + Commit message + Time ago + author
##############
ls = ls-files # Show information about files in the index and the working tree
lsm = ls-files --modified # Show modified files in the output
lss = ls-files --stage # Show staged contents' mode bits, object name and stage number in the output.
##############
m = merge # Join two or more development histories together
ma = merge --abort # Abort the current conflict resolution process, and try to reconstruct the pre-merge state.
mc = merge --continue # After a git merge stops due to conflicts you can conclude the merge by running git merge --continue
mq = merge --quit # Forget about the current merge in progress. Leave the index and the working tree as-is.
mm = merge master # Merge 'master' branch to the current branch.
##############
o = checkout # Switch branches or restore working tree files.
om = checkout master # Switch branch to master.
ob = checkout -b # Create and switch to a new branch
##############
pr = prune --verbose --progress # Prune all unreachable objects from the object database. Report all removed objects. Show progress.
prn = prune --dry-run # Do not remove anything; just report what it would remove.
##############
ps = push # Update remote refs along with associated objects
psa = push --all # Push all branches (i.e. refs under refs/heads/); cannot be used with other <refspec>.
psf = push --force # Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables these checks, and can cause the remote repository to lose commits; use it with care.
psu = push --set-upstream # For every branch that is up to date or successfully pushed, add upstream (tracking) reference.
##############
pso = push origin # `origin` is an alias in the system for a particular remote repository. Can be checked by running `git remote -v`.
psao = push --all origin # Same as `push --all` but for origin.
psfo = push --force origin # Same as `push --force` but for origin.
psuo = push --set-upstream origin # Same as `push --set-upstream` but for origin.
#############
psom = push origin master # Same as `push origin` but for master branch.
psaom = push --all origin master # Same as `push --all origin` but for master branch.
psfom = push --force origin master # Same as `push --force origin` but for master branch.
psuom = push --set-upstream origin master # Same as `push --set-upstream origin` but for master branch.
#############
pl = pull # Fetch from and integrate with another repository or a local branch.
plr = pull --rebase # When true, rebase the current branch on top of the upstream branch after fetching.
plv = pull --verbose # Pass --verbose to git-fetch and git-merge.
#############
plo = pull origin # Same as `pull` but for origin.
plro = pull --rebase origin # Same as `pull --rebase` but for origin.
plom = pull origin master # Same as `pull origin` but for master branch.
#############
plu = pull upstream # Same as `pull` but for upstream.
plum = pull upstream master # Same as `pull upstream` but for master branch.
plrum = pull --rebase upstream master # Same as `pull --rebase` but for upstream and master branch.
#############
rb = rebase # Reapply commits on top of another base tip.
rba = rebase --abort # Abort the rebase operation and reset HEAD to the original branch.
rbc = rebase --continue # Restart the rebasing process after having resolved a merge conflict.
rbi = rebase --interactive # Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits.
rbs = rebase --skip # Restart the rebasing process by skipping the current patch.
rbin = "!r() { git rebase -i HEAD~$1; }; r" # Interactive rebase with the given number of latest commits.
#############
re = reset # Reset current HEAD to the specified state
rh = reset HEAD # HEAD is defined explicitly
reh = reset --hard # Resets the index and working tree. Any changes to tracked files in the working tree since <commit> are discarded.
rem = reset --mixed # Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action.
res = reset --soft # Does not touch the index file or the working tree at all (but resets the head to <commit>, just like all modes do). This leaves all your changed files "Changes to be committed".
rehh = reset --hard HEAD # HEAD is defined explicitly
remh = reset --mixed HEAD # HEAD is defined explicitly
resh = reset --soft HEAD # HEAD is defined explicitly
rehom = reset --hard origin/master # Throw away all my staged and unstaged changes, forget everything on my current local branch and make it exactly the same as origin/master.
#############
r = remote # Manage set of tracked repositories
ra = remote add # Adds a remote named <name> for the repository at <url>.
rr = remote remove # Remove the remote named <name>. All remote-tracking branches and configuration settings for the remote are removed.
rv = remote --verbose # Be a little more verbose and show remote url after name.
rn = remote rename # Rename the remote named <old> to <new>. All remote-tracking branches and configuration settings for the remote are updated.
rp = remote prune # Deletes stale references associated with <name>. By default, stale remote-tracking branches under <name> are deleted, but depending on global configuration and the configuration of the remote we might even prune local tags that haven't been pushed there.
rs = remote show # Gives some information about the remote <name>.
rao = remote add origin # Add new origin.
rau = remote add upstream # Add new upstream.
rro = remote remove origin # Remove origin.
rru = remote remove upstream # Remove upstream.
rso = remote show origin # Show current origin.
rsu = remote show upstream # Show current upstream.
rpo = remote prune origin # Prune current origin.
rpu = remote prune upstream # Prune current upstream.
#############
rmf = rm -f # Remove files from the working tree and from the index. Override the up-to-date check.
rmrf = rm -r -f # Same as above + Allow recursive removal when a leading directory name is given.
#############
s = status # Show the working tree status
sb = status -s -b # Same as above + Give the output in the short-format. Show the branch and tracking info even in short-format.
#############
sa = stash apply # Like pop, but do not remove the state from the stash list.
sc = stash clear # Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover.
sd = stash drop # Remove a single stash entry from the list of stash entries. When no <stash> is given, it removes the latest one.
sl = stash list # List the stash entries that you currently have.
sp = stash pop # Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of git stash push.
sps = stash push # Save your local modifications to a new stash entry and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state.
spsk = stash push -k # All changes already added to the index are left intact.
sw = stash show # Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no <stash> is given, it shows the latest one.
st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*'
#############
t = tag # Create, list, delete or verify a tag object signed with GPG.
td = tag --delete # Delete existing tags with the given names.
tl = tag --list # Show verbose output about tags.
#############
w = show # Show various types of objects.
wo = show --oneline # This is a shorthand for "--pretty=oneline --abbrev-commit" used together.
wf = show --format=fuller # Print more extensive info.
#############
aliases = !git config -l | grep alias | cut -c 7- # List git aliases
branches = branch --all # List both remote-tracking branches and local branches.
remotes = remote --verbose # Be a little more verbose and show remote url after name.
contributors = shortlog --summary --numbered # List contributors with number of commits
amend = commit --amend --no-edit # Amend the currently staged files to the latest commit.
go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f" # Switch to a branch, creating it if necessary
fb = "!f() { git branch -a --contains $1; }; f" # Find branches containing commit
ft = "!f() { git describe --always --contains $1; }; f" # Find tags containing commit
fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f" # Find commits by source code
fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f" # Find commits by commit message
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" # Remove branches that have already been merged with master (a.k.a. ‘delete merged’)