From 66e6ccf87fcabc0e31e4eb9449df2f79487a8d5c Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Fri, 21 Apr 2017 20:46:16 +0300
Subject: [PATCH] - Use git forget flags like reset, no need for different
aliases.
---
.gitconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitconfig b/.gitconfig
index c4de81d..487f384 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,8 +6,7 @@
empty-commit = commit --allow-empty
exec = "!exec "
ff = merge --no-edit --ff-only master
- forget = reset --mixed HEAD~1
- forget-hard = reset --hard HEAD~1
+ forget = reset HEAD~1
merg = merge --no-edit
posh = push --set-upstream origin HEAD
pul = pull --progress
--
GitLab