summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2025-07-31 12:50:11 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2025-07-31 12:53:42 +0900
commit958bc01404cc6213c30cdbad253fa82b55daeec2 (patch)
tree9ac57e99dbe75ed61d12efebff4650eb1eb80154 /etc
parenta21e9ffd00370e4046c42e852ec04e48c61dd26f (diff)
gitconfig: Relax useAutoBase.
It can be useful to produce patches from older commits, for example to share commits from the keyring branch between the main Guix repository and guix-maintenance. The previous 'true' value prevented that with a fatal error message. * etc/git/gitconfig [format] <useAutoBase>: Set to whenAble. Change-Id: Ib32407dd3695dcadcb16855b1b87147fabc2aca7
Diffstat (limited to 'etc')
-rw-r--r--etc/git/gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/git/gitconfig b/etc/git/gitconfig
index 9c7827ced2..4dc2f69606 100644
--- a/etc/git/gitconfig
+++ b/etc/git/gitconfig
@@ -7,7 +7,7 @@
[format]
forceinbodyfrom = true # help preserve commit authorship
thread = shallow
- useAutoBase = true
+ useAutoBase = whenAble
[pull]
rebase = true