diff --git a/profile/default/.gitconfig b/profile/default/.gitconfig
index 90957593dd4b32e5c675c3a397f0c0c131ece289..98a5b5e1406823ddce8d1464a417cd79d468a6fe 100644
--- a/profile/default/.gitconfig
+++ b/profile/default/.gitconfig
@@ -63,14 +63,15 @@
     default = simple
 
 [pull]
-    # Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` otherwise.
+    # Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` alternatively.
+    # Do not set `ff = only` in combination with `rebase = true` to allow automatic rebasing of local commits.
     #ff = only
-    # Use `git pull --rebase` by default, otherwise use `git fetch; git merge`
-    #rebase = true
+    # Use `git pull --rebase` by default, alternatively use `git fetch; git merge` (discouraged in most situations)
+    rebase = true
 
 [rebase]
-    # Automatically stash and pop your uncommitted changes
-    #autoStash = true
+    # Automatically stash and pop your uncommitted changes while rebasing
+    autoStash = true
 
 [alias]
     co = checkout
@@ -108,3 +109,4 @@
     adogd = !"git adogb --date=format:'%Y-%m-%d %H:%M:%S' --format=format:'%C(#d7ff5f)%h%C(reset)%C(auto)%d%C(reset) %C(normal)%s%C(reset) %C(#5fd7ff)%an%C(reset) %C(#d7d7ff)(%ad)%C(reset)'"
     adogj = !"git adogv"
     adog = !"git adogv"
+    adogg = !"git adogv -i --grep"
diff --git a/profile/rda/.gitconfig b/profile/rda/.gitconfig
index 8a9f958d0eb65081d949ecc0568f46af595cd79c..7b6f7da013660015347a2b4f1bcaa30e87c62714 100644
--- a/profile/rda/.gitconfig
+++ b/profile/rda/.gitconfig
@@ -74,13 +74,14 @@
     default = simple
 
 [pull]
-    # Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` otherwise.
+    # Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` alternatively.
+    # Do not set `ff = only` in combination with `rebase = true` to allow automatic rebasing of local commits.
     ff = only
-    # Use `git pull --rebase` by default, otherwise use `git fetch; git merge`
+    # Use `git pull --rebase` by default, alternatively use `git fetch; git merge` (discouraged in most situations)
     #rebase = true
 
 [rebase]
-    # Automatically stash and pop your uncommitted changes
+    # Automatically stash and pop your uncommitted changes while rebasing
     #autoStash = true
 
 [alias]