From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 7 Mar 2025 11:55:03 +0000 (-0500)
Subject: add example git configuration
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0afc2f664f7c04d3bf9f836b81ac37809ecdfc52;p=thirdparty%2Ffreeradius-server.git

add example git configuration

should be added a ~/.gitconfig
---

diff --git a/scripts/build/gitconfig b/scripts/build/gitconfig
new file mode 100644
index 0000000000..3632d9f68f
--- /dev/null
+++ b/scripts/build/gitconfig
@@ -0,0 +1,79 @@
+#
+#  Suggested contents for ~/.gitconfig
+#
+
+
+#
+#  Remove trailing whitespace from files
+#
+[apply]
+        whitespace = strip
+[add]
+        whitespace = strip
+[move]
+        whitespace = strip
+
+#
+#  On push. automatically set up a remote and follow the tags,
+#  so you don't have to do --set-upstream
+#
+[push]
+	default = simple
+	autoSetupRemote = true
+	followTags = true
+
+#
+#  Rebase on git pull, so your changes are always on top of the remote
+#  ones.  Merges are bad.
+#
+[pull]
+	rebase = true
+
+#
+#  Rebase merges, instead of creating merge commits.
+#
+#  Stash local changes before rebase, and pop them afterwards.
+#
+#  "updateRefs" means that more commits are rebased when pulling
+#  patches from multiple branches, which helps keep the history as a
+#  linear set of commits.
+#
+[rebase]
+	rebaseMerges = true
+	autoStash = true
+	updateRefs = true
+
+#
+#  Don't throw away data!
+#
+[mergetool]
+	keepBackup = true
+#
+#  Make diffs look better.
+#
+[diff]
+        algorithm = histogram
+        colorMoved = plain
+        mnemonicPrefix = true
+        renames = true
+
+#
+#  Make things prettier
+#
+[column]
+        ui = auto
+[branch]
+        sort = -committerdate
+[tag]
+        sort = version:refname
+
+#
+#  More useful things
+#
+[help]
+        autocorrect = prompt
+[commit]
+        verbose = true
+[rerere]
+        enabled = true
+        autoupdate = true