[git] Clean up aliases

gitconfig

@@ -13,15 +13,16 @@
     conflictstyle = diff3
 [alias]
     # Basics
-    st = status -s
+    br = branch
+    ck = checkout
     cl = clone
     cm = commit -m
     cma = commit -am
-    ck = checkout
+    ds = diff --staged
-    br = branch
     g = grep -En
-    gf = grep -Fn
+    gf = grep -Fn --
-    gi = grep -iFn
+    gi = grep -iFn --
+    st = status -s
 
     # Tweak defaults
     bra = branch -ra