summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorEkaitz Zarraga <ekaitz@elenq.tech>2021-01-13 23:31:44 +0100
committerEkaitz Zarraga <ekaitz@elenq.tech>2021-01-13 23:48:04 +0100
commit45503702fdb366ad643f4827e50c0df7cf93980e (patch)
tree5bf4bba9e22b75b39167351df42243b5b97122b5 /git
parent64b8b0c0ea9776f4d8002af1f57bf846dfe2697e (diff)
Reorder using Stow better
Diffstat (limited to 'git')
-rw-r--r--git/dot-git-prompt.sh (renamed from git/.git-prompt.sh)0
-rw-r--r--git/dot-gitconfig (renamed from git/.gitconfig)2
2 files changed, 2 insertions, 0 deletions
diff --git a/git/.git-prompt.sh b/git/dot-git-prompt.sh
index 64219e6..64219e6 100644
--- a/git/.git-prompt.sh
+++ b/git/dot-git-prompt.sh
diff --git a/git/.gitconfig b/git/dot-gitconfig
index e293ba4..86dcce2 100644
--- a/git/.gitconfig
+++ b/git/dot-gitconfig
@@ -13,3 +13,5 @@
default = simple
[alias]
lg = log --graph --oneline --decorate --all
+[pull]
+ ff = only