Showing
1 changed file
with
41 additions
and
0 deletions
Docs/GITBOOK/CodeHelping/Git/gitConfig.md
0 → 100644
1 | +## GIT CONFIG 设定 ## | ||
2 | + [alias] | ||
3 | + st = status | ||
4 | + co = checkout | ||
5 | + ci = commit | ||
6 | + br = branch | ||
7 | + lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | ||
8 | + lol = log --graph --decorate --pretty=oneline --abbrev-commit | ||
9 | + unstage = reset HEAD | ||
10 | + last = log -1 | ||
11 | + rb = reset --hard | ||
12 | + | ||
13 | + [color] | ||
14 | + ui = auto | ||
15 | + | ||
16 | + [core] | ||
17 | + autocrlf = false | ||
18 | + safecrlf = true | ||
19 | + editor = vim | ||
20 | + | ||
21 | + [diff] | ||
22 | + tool = p4merge | ||
23 | + | ||
24 | + [difftool "p4merge"] | ||
25 | + cmd = p4merge.exe $LOCAL $REMOTE | ||
26 | + path = D:\\Program Files\\Perforce\\p4merge.exe | ||
27 | + | ||
28 | + [difftool] | ||
29 | + prompt = false | ||
30 | + | ||
31 | + [merge] | ||
32 | + tool = p4merge | ||
33 | + | ||
34 | + [mergetool "p4merge"] | ||
35 | + cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED | ||
36 | + path = D:\\Program Files\\Perforce\\p4merge.exe | ||
37 | + | ||
38 | + [mergetool] | ||
39 | + prompt = false | ||
40 | + trustExitCode = false | ||
41 | + keepBackup = false | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
-
Please register or login to post a comment