|
1 | 1 | [alias] |
2 | 2 |
|
3 | | - # View abbreviated SHA, description, and history graph of the latest 20 commits |
| 3 | + # View abbreviated SHA, description, and history graph of the latest 20 commits. |
4 | 4 | l = log --pretty=oneline -n 20 --graph --abbrev-commit |
5 | 5 |
|
6 | | - # View the current working tree status using the short format |
| 6 | + # View the current working tree status using the short format. |
7 | 7 | s = status -s |
8 | 8 |
|
9 | | - # Show the diff between the latest commit and the current state |
| 9 | + # Show the diff between the latest commit and the current state. |
10 | 10 | d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat" |
11 | 11 |
|
12 | | - # `git di $number` shows the diff between the state `$number` revisions ago and the current state |
| 12 | + # `git di $number` shows the diff between the state `$number` revisions ago and the current state. |
13 | 13 | di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d" |
14 | 14 |
|
15 | | - # Pull in remote changes for the current repository and all its submodules |
16 | | - p = !"git pull; git submodule foreach git pull origin master" |
| 15 | + # Pull in remote changes for the current repository and all its submodules. |
| 16 | + p = pull --recurse-submodules |
17 | 17 |
|
18 | | - # Clone a repository including all submodules |
| 18 | + # Clone a repository including all submodules. |
19 | 19 | c = clone --recursive |
20 | 20 |
|
21 | | - # Commit all changes |
| 21 | + # Commit all changes. |
22 | 22 | ca = !git add -A && git commit -av |
23 | 23 |
|
24 | | - # Switch to a branch, creating it if necessary |
| 24 | + # Switch to a branch, creating it if necessary. |
25 | 25 | go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f" |
26 | 26 |
|
27 | 27 | # Show verbose output about tags, branches or remotes |
28 | 28 | tags = tag -l |
29 | | - branches = branch -a |
30 | | - remotes = remote -v |
| 29 | + branches = branch --all |
| 30 | + remotes = remote --verbose |
31 | 31 |
|
32 | | - # List aliases |
| 32 | + # List aliases. |
33 | 33 | aliases = config --get-regexp alias |
34 | 34 |
|
35 | | - # Amend the currently staged files to the latest commit |
| 35 | + # Amend the currently staged files to the latest commit. |
36 | 36 | amend = commit --amend --reuse-message=HEAD |
37 | 37 |
|
38 | | - # Credit an author on the latest commit |
| 38 | + # Credit an author on the latest commit. |
39 | 39 | credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" |
40 | 40 |
|
41 | | - # Interactive rebase with the given number of latest commits |
| 41 | + # Interactive rebase with the given number of latest commits. |
42 | 42 | reb = "!r() { git rebase -i HEAD~$1; }; r" |
43 | 43 |
|
44 | 44 | # Remove the old tag with this name and tag the latest commit with it. |
|
56 | 56 | # Find commits by commit message |
57 | 57 | fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f" |
58 | 58 |
|
59 | | - # Remove branches that have already been merged with master |
| 59 | + # Remove branches that have already been merged with main. |
60 | 60 | # a.k.a. ‘delete merged’ |
61 | 61 | dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" |
62 | 62 |
|
63 | | - # List contributors with number of commits |
| 63 | + # List contributors with number of commits. |
64 | 64 | contributors = shortlog --summary --numbered |
65 | 65 |
|
66 | | - # Merge GitHub pull request on top of the current branch or, |
67 | | - # if a branch name is specified, on top of the specified branch |
68 | | - mpr = "!f() { \ |
69 | | - declare currentBranch=\"$(git symbolic-ref --short HEAD)\"; \ |
70 | | - declare branch=\"${2:-$currentBranch}\"; \ |
71 | | - if [ $(printf \"%s\" \"$1\" | grep '^[0-9]\\+$' > /dev/null; printf $?) -eq 0 ]; then \ |
72 | | - git fetch origin refs/pull/$1/head:pr/$1 && \ |
73 | | - git checkout -B $branch && \ |
74 | | - git rebase $branch pr/$1 && \ |
75 | | - git checkout -B $branch && \ |
76 | | - git merge pr/$1 && \ |
77 | | - git branch -D pr/$1 && \ |
78 | | - git commit --amend -m \"$(git log -1 --pretty=%B)\n\nCloses #$1.\"; \ |
79 | | - fi \ |
80 | | - }; f" |
| 66 | + # Show the user email for the current repository. |
| 67 | + whoami = config user.email |
81 | 68 |
|
82 | 69 | # Old faithful - single line, abbreviated SHA & color |
83 | 70 | logger = log --oneline --decorate |
|
105 | 92 |
|
106 | 93 | [apply] |
107 | 94 |
|
108 | | - # Detect whitespace errors when applying a patch |
| 95 | + # Detect whitespace errors when applying a patch. |
109 | 96 | whitespace = fix |
110 | 97 |
|
| 98 | +[branch] |
| 99 | + |
| 100 | + # Show most recently changed branches first. |
| 101 | + sort = -committerdate |
| 102 | + |
111 | 103 | [core] |
112 | 104 |
|
113 | | - # Use custom `.gitignore` and `.gitattributes` |
| 105 | + # Use custom `.gitignore` and `.gitattributes`. |
114 | 106 | excludesfile = ~/.gitignore |
115 | 107 | attributesfile = ~/.gitattributes |
116 | 108 |
|
117 | | - # Treat spaces before tabs and all kinds of trailing whitespace as an error |
| 109 | + # Treat spaces before tabs and all kinds of trailing whitespace as an error. |
118 | 110 | # [default] trailing-space: looks for spaces at the end of a line |
119 | 111 | # [default] space-before-tab: looks for spaces before tabs at the beginning of a line |
120 | 112 | whitespace = space-before-tab,-indent-with-non-tab,trailing-space |
121 | 113 |
|
122 | | - # Make `git rebase` safer on macOS |
| 114 | + # Make `git rebase` safer on macOS. |
123 | 115 | # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/> |
124 | 116 | trustctime = false |
125 | 117 |
|
|
166 | 158 |
|
167 | 159 | [diff] |
168 | 160 |
|
169 | | - # Detect copies as well as renames |
| 161 | + # Detect copies as well as renames. |
170 | 162 | renames = copies |
171 | 163 |
|
172 | 164 | [diff "bin"] |
173 | 165 |
|
174 | | - # Use `hexdump` to diff binary files |
| 166 | + # Use `hexdump` to diff binary files. |
175 | 167 | textconv = hexdump -v -C |
176 | 168 |
|
177 | 169 | [help] |
178 | 170 |
|
179 | | - # Automatically correct and execute mistyped commands |
| 171 | + # Automatically correct and execute mistyped commands. |
180 | 172 | autocorrect = 1 |
181 | 173 |
|
182 | 174 | [merge] |
|
212 | 204 | [url "git://gist.github.com/"] |
213 | 205 |
|
214 | 206 | insteadOf = "gist:" |
| 207 | + |
| 208 | +[init] |
| 209 | + |
| 210 | + templateDir = ~/.config/git/template/ |
0 commit comments