aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitconfig b/.gitconfig
index 3f342db..0328c96 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -90,12 +90,12 @@
rid = rebase -i develop
rc = rebase --continue
m = merge
- mc = merge --continue
+ mc = merge --continue --no-edit
mm = mergetool
pullu = "!git pull upstream $(git cb) --ff"
pullo = "!git pull origin $(git cb) --ff"
pusho = "!git push origin $(git cb)"
cpick = cherry-pick
- cpickc = cherry-pick --continue
+ cpickc = cherry-pick --continue --no-edit
empty = commit --allow-empty
last-merge-commit = "!git rev-list --abbrev-commit --merges HEAD | head -n 1"