diff --git a/home/gitconfig b/home/gitconfig
index 1b87949..3d68338 100644
--- a/home/gitconfig
+++ b/home/gitconfig
@@ -41,3 +41,5 @@
 	undo = reset HEAD~1 --mixed
 	backup = !git push origin/backup/$(whoami)/$(git branch)
 	lint = !git branch --merged | grep -v \"^\\s*master$\" | grep -v \"\\*\" | xargs -n 1 git branch -d
+	modified = !git status --porcelain | perl -ne '/^M  (.*)/ and print \"$1\\n\"'
+	conflicts = !git status --porcelain | perl -ne '/^UU (.*)/ and print \"$1\\n\"'