/
gitconfig_setup.sh
executable file
·109 lines (84 loc) · 4.12 KB
/
gitconfig_setup.sh
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
#!/bin/bash
git config --global user.name "Val Markovic"
current_email=$(git config --global --get user.email)
# if current_email is empty, then add an email
if [[ -z "$current_email" ]]
then
git config --global user.email "val@markovic.io"
fi
git config --global github.user valloric
git config --global alias.st status
git config --global alias.co checkout
git config --global alias.ci commit
git config --global alias.br "branch -vv"
git config --global alias.d difftool
git config --global alias.h help
git config --global alias.sub submodule
git config --global alias.unstage "reset HEAD"
git config --global alias.unstash "stash pop"
git config --global alias.dst "diff --staged"
git config --global alias.dc "!git --paginate difftool --extcmd='icdiff --recursive --no-bold --tabsize=2'"
git config --global alias.dcs "!git --paginate difftool --staged --extcmd='icdiff --recursive --no-bold --tabsize=2'"
git config --global alias.cp "cherry-pick"
git config --global alias.rb "rebase"
git config --global alias.lg "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
# Pipes "git status" through LESS
# Can set "pager.<tool>" to enable the pager for other commands.
# Also, can use "git --paginate <tool>" to make pagination per-invocation.
git config --global pager.status true
git config --global color.ui true
git config --global diff.tool kdiff3
git config --global difftool.prompt false
git config --global merge.tool kdiff3
git config --global alias.ks "difftool -y -t Kaleidoscope"
git config --global alias.meld "difftool --tool=meld --dir-diff -y"
# This gives us 'ours', 'base', and 'theirs', instead of just 'ours' and
# 'theirs'. More details:
# http://psung.blogspot.com/2011/02/reducing-merge-headaches-git-meets.html
git config --global merge.conflictstyle diff3
# Prevents us from having to do merge resolution for things we've already
# resolved before; see http://git-scm.com/blog/2010/03/08/rerere.html
git config --global rerere.enabled true
# With this, "git pull --rebase" is the default form of pull FOR NEWLY CREATED
# BRANCHES; for branches created before this config option is set, pull.rebase
# true handles that
git config --global branch.autosetuprebase always
# "git pull --rebase" is now the default for pull no matter what
git config --global pull.rebase true
# This makes sure that push pushes only the current branch, and pushes it to the
# same branch pull would pull from
git config --global push.default upstream
# This converts CRLF endings to LF endings on Mac & Lin and also keeps them in
# the repo, but for Windows checkouts it converts LF to CRLF (and back to LF on
# commits)
git config --global core.autocrlf input
git config --global core.excludesfile ~/.gitignore_global
# Forces the use of SSH instead of HTTPS for any URLs that point to github.
# This means that if a repo uses "https://github/..." for "origin", we will
# automatically use SSH. No more password prompts!
# Off because it messes up Cargo
#git config --global url.ssh://git@github.com/.insteadOf https://github.com/
# Makes "git stash show" display a diff by default
git config --global stash.showPatch true
# Makes rebasing stash any dirty changes before running rebase, and then
# unstashes them afterwards.
git config --global rebase.autostash true
# Make --autosquash always-on for rebase commands
# Autosquash automatically squashes commits that start with "squash!" or
# "fixup!". See "git rebase" docs for details.
git config --global rebase.autosquash true
# When editing the commit message, git will now always include a diff of the
# changes below the message area (the diff does NOT become part of the commit
# message, it's only there for information).
git config --global commit.verbose true
# Number of concurrent submodule fetches
git config --global submodule.fetchJobs 8
# Prettier diffs
git config --global diff.compactionHeuristic true
git config --global diff.indentHeuristic on
# Make git use the system-default web browser.
if [[ $(uname) == *Darwin* ]]; then
git config --global web.browser open
else
git config --global web.browser xdg-open
fi