summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
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