summaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2017-04-02 13:25:36 +0200
committerFlorian Pritz <bluewind@xinu.at>2017-04-02 13:25:36 +0200
commit87e48f4427da2ab506ce07cff95a17235525f087 (patch)
treed3c30ef6b2e661f322cd59027531a8e76c91cd5b /.gitconfig
parentae3742b30de7fa014a92a630fdc03c1849bf26e2 (diff)
downloaddotfiles-87e48f4427da2ab506ce07cff95a17235525f087.tar.gz
dotfiles-87e48f4427da2ab506ce07cff95a17235525f087.tar.xz
misc changes
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index bb1db9c..cd6037b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -24,6 +24,7 @@
p = push --follow-tags
dw = diff --color-words
ri = rebase -i --autosquash
+ fix = commit --fixup
[merge]
tool = kdiff3
conflictstyle = diff3