author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Tue, 11 Aug 2015 16:27:42 +0300 | |
changeset 745 | 65070eb4aabb |
parent 731 | 17d67f65193b |
child 763 | 0070d0ec18d2 |
permissions | -rw-r--r-- |
116 | 1 |
# -*- mode: conf -*- |
2 |
||
3 |
[user] |
|
4 |
name = Oleksandr Gavenko |
|
5 |
email = gavenkoa@gmail.com |
|
6 |
||
7 |
[alias] |
|
8 |
br = branch |
|
9 |
ci = commit -a |
|
10 |
co = checkout |
|
11 |
cp = cherry-pick |
|
12 |
graph = log --graph --oneline --decorate |
|
13 |
info = config --list |
|
14 |
pop = !git stash apply && git stash clear |
|
15 |
sb = show-branch |
|
16 |
st = status |
|
17 |
staged = diff --cached |
|
18 |
summary = log --oneline |
|
19 |
tags = tag -n1 -l |
|
20 |
w = whatchanged |
|
718
0507a0b1a45a
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
713
diff
changeset
|
21 |
glog = log --all --graph |
116 | 22 |
|
23 |
[core] |
|
456
dc10370dab78
Remove non-exist option.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
194
diff
changeset
|
24 |
whitespace=-indent-with-non-tab,trailing-space,cr-at-eol |
116 | 25 |
excludesfile = ~/.gitignore |
26 |
||
27 |
[apply] |
|
28 |
# fix/strip/nowarn |
|
29 |
# whitespace = strip |
|
30 |
||
457
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
31 |
[color] |
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
32 |
branch = auto |
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
33 |
diff = auto |
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
34 |
grep = auto |
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
35 |
interactive = auto |
473
36b5162c917b
Fix color.pager value: type mismatch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
457
diff
changeset
|
36 |
pager = true |
457
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
37 |
showbranch = auto |
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
38 |
status = auto |
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
39 |
ui = auto |
ed6c0bb1a820
Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
456
diff
changeset
|
40 |
|
116 | 41 |
[diff] |
42 |
# Makes the diff much shorter when moving or copying files. |
|
43 |
rename = copy |
|
44 |
||
45 |
# The number of files to consider when performing the copy/rename |
|
46 |
# detection; equivalent to the git diff option -l. |
|
47 |
# renamelimit = 0 |
|
620
e752deb194d3
Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
473
diff
changeset
|
48 |
|
731
17d67f65193b
merge.conflictstyle diff3
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
718
diff
changeset
|
49 |
[merge] |
17d67f65193b
merge.conflictstyle diff3
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
718
diff
changeset
|
50 |
conflictstyle = diff3 |
17d67f65193b
merge.conflictstyle diff3
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
718
diff
changeset
|
51 |
|
620
e752deb194d3
Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
473
diff
changeset
|
52 |
[log] |
e752deb194d3
Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
473
diff
changeset
|
53 |
date = iso |
e752deb194d3
Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
473
diff
changeset
|
54 |
|
713
c35497e441fd
Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
620
diff
changeset
|
55 |
[push] |
c35497e441fd
Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
620
diff
changeset
|
56 |
# Push only current brunch. |
c35497e441fd
Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
620
diff
changeset
|
57 |
default = simple |
c35497e441fd
Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
620
diff
changeset
|
58 |