Mercurial > dotfiles

annotate git/gitconfig @ 383:ff48d206d1f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Miscellaneous tweaks.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 05 Aug 2017 22:11:13 -0700
parents a951ca3b5d8c
children 4cbf9f8b4a37
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
124
20c49d51f7e3 Added `.gitconfig`.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
1 [user]
215
02ea6f694bb8 Git config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 124
diff changeset
2 name = Ludovic Chabant
124
20c49d51f7e3 Added `.gitconfig`.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
3 email = ludovic@chabant.com
215
02ea6f694bb8 Git config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 124
diff changeset
4
02ea6f694bb8 Git config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 124
diff changeset
5 [push]
02ea6f694bb8 Git config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 124
diff changeset
6 default = simple
02ea6f694bb8 Git config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 124
diff changeset
7
292
6938fb0146f5 Add stuff to `gitconfig`, use better installation for it.
Ludovic Chabant <ludovic@chabant.com>
parents: 215
diff changeset
8 [alias]
6938fb0146f5 Add stuff to `gitconfig`, use better installation for it.
Ludovic Chabant <ludovic@chabant.com>
parents: 215
diff changeset
9 lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
6938fb0146f5 Add stuff to `gitconfig`, use better installation for it.
Ludovic Chabant <ludovic@chabant.com>
parents: 215
diff changeset
10 lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
6938fb0146f5 Add stuff to `gitconfig`, use better installation for it.
Ludovic Chabant <ludovic@chabant.com>
parents: 215
diff changeset
11 lg = !"git lg1"
6938fb0146f5 Add stuff to `gitconfig`, use better installation for it.
Ludovic Chabant <ludovic@chabant.com>
parents: 215
diff changeset
12
358
a951ca3b5d8c Add local `gitconfig`.
Ludovic Chabant <ludovic@chabant.com>
parents: 292
diff changeset
13 [include]
a951ca3b5d8c Add local `gitconfig`.
Ludovic Chabant <ludovic@chabant.com>
parents: 292
diff changeset
14 path = gitconfig-local
383
ff48d206d1f1 Miscellaneous tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 358
diff changeset
15 [difftool "sourcetree"]
ff48d206d1f1 Miscellaneous tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 358
diff changeset
16 cmd = opendiff \"$LOCAL\" \"$REMOTE\"
ff48d206d1f1 Miscellaneous tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 358
diff changeset
17 path =
ff48d206d1f1 Miscellaneous tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 358
diff changeset
18 [mergetool "sourcetree"]
ff48d206d1f1 Miscellaneous tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 358
diff changeset
19 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
ff48d206d1f1 Miscellaneous tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 358
diff changeset
20 trustExitCode = true