.gitconfig
author Oleksandr Gavenko <gavenkoa@gmail.com>
Thu, 26 Jan 2017 14:55:51 +0200
changeset 819 6d313c0c6247
parent 764 8867e8616467
child 823 b7c18fdcc666
permissions -rw-r--r--
Do not duplicate completion if we in the middle of the word.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
116
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     1
# -*- mode: conf -*-
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     2
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     3
[user]
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     4
name = Oleksandr Gavenko
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     5
email = gavenkoa@gmail.com
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     6
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     7
[alias]
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     8
br = branch
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     9
ci = commit -a
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    10
co = checkout
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    11
cp = cherry-pick
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    12
graph = log --graph --oneline --decorate
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    13
info = config --list
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    14
pop = !git stash apply && git stash clear
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    15
sb = show-branch
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    16
st = status
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    17
staged = diff --cached
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    18
summary = log --oneline
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    19
tags = tag -n1 -l
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    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
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    22
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    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
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    25
excludesfile = ~/.gitignore
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    26
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    27
[apply]
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    28
# fix/strip/nowarn
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    29
# whitespace = strip
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    30
457
ed6c0bb1a820 Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 456
diff changeset
    31
[color]
763
0070d0ec18d2 Swap order to group related options together.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 731
diff changeset
    32
pager = true
457
ed6c0bb1a820 Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 456
diff changeset
    33
ui = auto
ed6c0bb1a820 Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 456
diff changeset
    34
116
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    35
[diff]
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    36
# Makes the diff much shorter when moving or copying files.
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    37
rename = copy
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    38
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    39
# The number of files to consider when performing the copy/rename
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    40
# detection; equivalent to the git diff option -l.
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    41
# renamelimit = 0
620
e752deb194d3 Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 473
diff changeset
    42
731
17d67f65193b merge.conflictstyle diff3
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 718
diff changeset
    43
[merge]
17d67f65193b merge.conflictstyle diff3
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 718
diff changeset
    44
conflictstyle = diff3
17d67f65193b merge.conflictstyle diff3
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 718
diff changeset
    45
620
e752deb194d3 Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 473
diff changeset
    46
[log]
e752deb194d3 Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 473
diff changeset
    47
date = iso
e752deb194d3 Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 473
diff changeset
    48
713
c35497e441fd Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 620
diff changeset
    49
[push]
c35497e441fd Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 620
diff changeset
    50
# Push only current brunch.
c35497e441fd Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 620
diff changeset
    51
default = simple
c35497e441fd Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 620
diff changeset
    52