summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2018-05-09 13:17:28 +0200
committerFlorian Pritz <bluewind@xinu.at>2018-05-09 13:17:28 +0200
commite14cde25eb059370daa87a5e0601ada40f8e2e77 (patch)
tree22bf8a314d17c80b52c6710082fd5e9c0654a87e
parent0d0810e84dbab21fa55a8d2a947eb63d1352f873 (diff)
downloaddotfiles-e14cde25eb059370daa87a5e0601ada40f8e2e77.tar.gz
dotfiles-e14cde25eb059370daa87a5e0601ada40f8e2e77.tar.xz
git: Add f alias for fetch
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--.gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index e406745..00b951f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -26,6 +26,7 @@
ri = rebase -i --autosquash
fix = commit --fixup
list-branches = branch --sort=committerdate --format='%(HEAD) %(color:red)%(objectname:short)%(color:reset) %(align:30)%(color:yellow)%(refname:short)%(color:reset)%(end) %(align:30)(%(color:green)%(committerdate:relative)%(color:reset))%(end) %(align:20)%(authorname)%(end) %(contents:subject)'
+ f = fetch -p --all
[merge]
tool = kdiff3
conflictstyle = diff3