dotfiles

My personal shell configs and stuff
git clone git://git.alex.balgavy.eu/dotfiles.git
Log | Files | Refs | Submodules | README | LICENSE
commit 974c89366dbf7204e597ef08fcfec66030b42eb6
parent 725893a771da76d5ee9bd083ac5eb9741a43f860
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Wed, 31 Oct 2018 15:05:16 +0100

Fixed git merge no ff alias

Diffstat:

Mgit/gitconfig | 2+-


1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/gitconfig b/git/gitconfig
@@ -32,7 +32,7 @@
     diffs = "diff --staged"
     changes = diff --summary --stat
     mergetest = merge --no-commit --no-f
-    mergen = --no-ff
+    mergeno = merge --no-ff
     delete-merged = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
     p = push
     pp = pull