forked from bitboxer/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig.erb
43 lines (37 loc) · 1018 Bytes
/
gitconfig.erb
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
[user]
name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
[alias]
co = checkout
[color]
diff = auto
status = auto
branch = auto
[core]
excludesfile = <%= ENV['HOME'] %>/.gitignore
[apply]
whitespace = nowarn
<%
print("Your Github Username (Press enter to ignore Github) : ")
STDOUT.flush;
github = STDIN.gets.chomp;
if (github.length > 0)
%>[github]
user = <%= github %>
<% end %>
[format]
pretty = %C(yellow)%h%Creset %s %C(red)(%cr)%Creset
# More details about the git mergetool option can be found here:
# http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/
<% if PLATFORM.match /darwin/i %>
[merge]
tool = diffmerge
# DiffMerge can be found here :
# http://www.sourcegear.com/diffmerge/
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = false
<% else %>
[merge]
tool = kdiff3
<% end %>