From 9dca9e2e1e0b16fe0322a8f86197eb0593c70600 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 23 Mar 2019 23:11:16 +0100 Subject: [PATCH] GITOLITE.txt --- GITOLITE.txt | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/GITOLITE.txt b/GITOLITE.txt index cd1c0c5..0b282c4 100644 --- a/GITOLITE.txt +++ b/GITOLITE.txt @@ -9,30 +9,33 @@ http://git.somenet.org/tools/vmdiff.git GITOLITE instance admin (send ssh-keys to): someone@somenet.org + +RECOMMENDED CLIENT CONFIGURATION -------------------------------------------------------------------------- -RECOMMENDED CLIENT CONFIGURATION: + # Show forgotten whitespaces. +git config color.ui true +git config color.diff.whitespace red reverse - # Make Git enable rebasing instead of merging on all new tracked - # branches in *ALL* your repos. (get rid of merge-commits when pulling) - # Affects only *NEW* tracked branches. -git config --global branch.autosetuprebase always +################ +# Use rebasing # +################ +git config --global branch.autosetuprebase always +git config --global rebase.autoStash true +git config --global rebase.stat true - # Make Git rebase the master branch instead of merging in *ALL* your - # repos. (get rid of merge-commits when pulling) - # Useful if you didnt have branch.autosetuprebase set before cloning - # and want all your repos to rebase. + # Make git rebase the master branch instead of merging in *ALL* your + # repos. (get rid of merge-commits when pulling) + # Useful if you didnt have branch.autosetuprebase set before cloning + # and want all your repos to rebase. git config --global branch.master.rebase true - # If you like colors consider adding these config options. -git config color.ui true -git config color.diff.whitespace red reverse - - - # WINDOWS USERS ONLY - # Make Git convert all the types of newline to "\n". - # Might break some stuff. +################# +# WINDOWS USERS # +################# + # Make Git convert all the types of newline to "\n". + # Might break some stuff. git config core.autocrlf input -------------------------------------------------------------------------- AUTOGENERATED FILE. -- 2.43.0