.gitconfig
author Oleksandr Gavenko <gavenkoa@gmail.com>
Mon, 01 Jan 2024 20:53:49 +0200
changeset 1039 78cdb4a057e3
parent 1027 50902745d28c
permissions -rw-r--r--
Create symlink from ~/.bash_profile for login shell to activate my ~/.bashrc.
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
[alias]
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     4
br = branch
862
24c14627e34b `-a` option to commit causes many troubles to me.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 823
diff changeset
     5
ci = commit
116
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     6
co = checkout
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     7
cp = cherry-pick
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     8
graph = log --graph --oneline --decorate
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     9
info = config --list
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    10
sb = show-branch
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    11
st = status
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    12
staged = diff --cached
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    13
summary = log --oneline
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    14
tags = tag -n1 -l
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    15
w = whatchanged
898
6ac59832aba5 Exclude stash from glog.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 897
diff changeset
    16
glog = log --graph --exclude=refs/heads/*.stgit --exclude=refs/patches/* --exclude=refs/stash --all
116
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    17
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    18
[core]
456
dc10370dab78 Remove non-exist option.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 194
diff changeset
    19
whitespace=-indent-with-non-tab,trailing-space,cr-at-eol
116
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    20
excludesfile = ~/.gitignore
879
274f5f8ff1a5 Prefer LF EOL. Normalize EOL to LF.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 862
diff changeset
    21
autocrlf = input
274f5f8ff1a5 Prefer LF EOL. Normalize EOL to LF.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 862
diff changeset
    22
safecrlf = warn
274f5f8ff1a5 Prefer LF EOL. Normalize EOL to LF.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 862
diff changeset
    23
eol = lf
823
b7c18fdcc666 Ignore UNIX file permission under Windows. Relax CR/LF.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 764
diff changeset
    24
filemode = false
116
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    25
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    26
[apply]
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    27
# fix/strip/nowarn
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    28
# whitespace = strip
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    29
457
ed6c0bb1a820 Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 456
diff changeset
    30
[color]
763
0070d0ec18d2 Swap order to group related options together.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 731
diff changeset
    31
pager = true
457
ed6c0bb1a820 Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 456
diff changeset
    32
ui = auto
ed6c0bb1a820 Update to new syntax for colouring output.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 456
diff changeset
    33
116
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    34
[diff]
906
00b35243abf4 Increased Git diff context to 5.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 898
diff changeset
    35
context = 5
116
a8fea1f09a09 Config for git.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    36
# Makes the diff much shorter when moving or copying files.
889
7e51f0012eb6 Replaced option to more modern.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 879
diff changeset
    37
renames = copy
116
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
890
96b4250c52f8 Follow history after renames in git log.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 889
diff changeset
    48
follow = true
620
e752deb194d3 Use ISO 8601 date format for "git log".
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 473
diff changeset
    49
713
c35497e441fd Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 620
diff changeset
    50
[push]
c35497e441fd Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 620
diff changeset
    51
# Push only current brunch.
c35497e441fd Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 620
diff changeset
    52
default = simple
c35497e441fd Push only current brunch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 620
diff changeset
    53
944
abefcbeca9a5 New git on "git pull" asked to config one of:
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 906
diff changeset
    54
[pull]
abefcbeca9a5 New git on "git pull" asked to config one of:
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 906
diff changeset
    55
ff = only
abefcbeca9a5 New git on "git pull" asked to config one of:
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 906
diff changeset
    56
973
277ccd286936 Enabled rerere. Keeps database of manually resolved conflicts.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 944
diff changeset
    57
[rerere]
277ccd286936 Enabled rerere. Keeps database of manually resolved conflicts.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 944
diff changeset
    58
# Reuse Recorded Resolution. Keeps database of manually resolved conflicts.
277ccd286936 Enabled rerere. Keeps database of manually resolved conflicts.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 944
diff changeset
    59
enabled = true
1027
50902745d28c Moved git username to a separate file: .gitconfig.extra.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 996
diff changeset
    60
50902745d28c Moved git username to a separate file: .gitconfig.extra.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 996
diff changeset
    61
# [user] section is in .gitconfig.extra