From b41c6245b39c4ffa5b12bd472c5590ace9746b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20M=C3=A4der?= <maeder@phys.ethz.ch>
Date: Fri, 28 Apr 2023 16:21:53 +0200
Subject: [PATCH] Enable automatic rebasing with autostash by default, add git
adogg
---
profile/default/.gitconfig | 12 +++++++-----
profile/rda/.gitconfig | 7 ++++---
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/profile/default/.gitconfig b/profile/default/.gitconfig
index 9095759..98a5b5e 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 8a9f958..7b6f7da 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]
--
GitLab