Merge pull request #227 from himkt/git-subcommand

feat: add `git remove-merged`
himkt · Feb 2, 2024 · 4d4d9e2 · 4d4d9e2
2 parents 3655659 + 3dbaa86
commit 4d4d9e2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -69,6 +69,7 @@ cargo_clean:
 	rm -rf $(HOME)/.cargo/config.toml
 
 git_clean:
+	rm -rf $(HOME)/.config/git/config
 	rm -rf $(HOME)/.config/git/ignore
 
 nvim_clean:

diff --git a/git/bin/setup.sh b/git/bin/setup.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
 mkdir -p $HOME/.config/git
-rm -f $HOME/.config/git/ignore
+
+rm -rf $HOME/.config/git/config
+rm -rf $HOME/.config/git/ignore
+
+ln -s $HOME/dotfiles/git/config.d/config $HOME/.config/git/config
 ln -s $HOME/dotfiles/git/config.d/ignore $HOME/.config/git/ignore
diff --git a/git/config.d/config b/git/config.d/config
@@ -0,0 +1,9 @@
+[user]
+	email = [email protected]
+	name = himkt
+
+[pull]
+	rebase = false
+
+[alias]
+	remove-merged = !remove-merged-branches