diff options
| author | Florian Pritz <bluewind@xinu.at> | 2016-08-19 13:57:31 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2016-08-19 13:57:31 +0200 |
| commit | d422173a56cc205e2c16df3d811876db3fc6039d (patch) | |
| tree | c18b1db1c8ef528308eb152d8bc09f7f140ae689 /.gitconfig | |
| parent | ccf5439d18adc585cc0826591df9ebeaf65405a0 (diff) | |
| download | dotfiles-d422173a56cc205e2c16df3d811876db3fc6039d.tar.gz dotfiles-d422173a56cc205e2c16df3d811876db3fc6039d.tar.xz | |
misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -23,6 +23,7 @@ theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" p = push --follow-tags dw = diff --color-words + ri = rebase -i --autosquash [merge] tool = kdiff3 conflictstyle = diff3 |