feat: add some git aliase, remove git merge "--no-ff" for squash

ndxbn · Nov 10, 2024 · 90e42d8 · 90e42d8
1 parent 7f24f5b
commit 90e42d8
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -14,13 +14,11 @@
 [init]
 [alias]
 	logg = log --graph
-	logl = log --oneline
-	#  ^ (log l)iner
-	pullupstream = pull upstream master
+	log1 = log --oneline
+	logg1 = log --graph --oneline
+	pullupstream = pull upstream main
 	subpull = submodule foreach git pull origin master
 
-[merge]
-	ff = false
 [pull]
 	ff = true
 [push]