skel: .gitconfig: use rebase mode by default for git pull

nodiscc · Jan 5, 2022 · b8686a8 · b8686a8
1 parent 9faf401
commit b8686a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ## [v3.0.0](https://gitlab.com/nodiscc/dlc/releases/tag/3.0.1) - UNRELEASED
 
 ### Changed
-- defaults/skel: `.gitconfig`: remember git HTTP credentials
+- defaults/skel: `.gitconfig`: remember git HTTP credentials, use rebase mode by default for `git pull`
 
 
 ## [v3.0.0](https://gitlab.com/nodiscc/dlc/releases/tag/3.0.0) - 2021-10-28

diff --git a/config/includes.chroot/etc/skel/.gitconfig b/config/includes.chroot/etc/skel/.gitconfig
@@ -17,6 +17,8 @@
 	thanks = shortlog -sne
 [credential]
 	helper = store
+[pull]
+	rebase = true
 
 # force GPG signing of all commits and tags
 #[commit]