GITOLITE.txt

diff --git a/GITOLITE.txt b/GITOLITE.txt
index cb7c47faac3cf5709518d1cb76f253c59bdd3ced..5cd43c70ebbf05cd56762e0f9606a8b243f0e3e8 100644 (file)
--- a/GITOLITE.txt
+++ b/GITOLITE.txt
@@ -11,26 +11,24 @@ GITOLITE instance admin (send ssh-keys to):
 someone@somenet.org
 
 
 someone@somenet.org
 
 

-RECOMMENDED CLIENT CONFIGURATION
---------------------------------------------------------------------------
+RECOMMENDED CONFIGURATION
+----------------------------------------------------------------------

     # Show forgotten whitespaces.
     # Show forgotten whitespaces.

-git config color.ui true
-git config color.diff.whitespace red reverse
+git config --global color.ui true
+git config --global color.diff.whitespace red reverse

 
 
 
 

-       # remove removed branches + tags.
+    # remove removed branches + tags.

 git config --global fetch.prune true
 git config --global fetch.pruneTags true
 
 
 git config --global fetch.prune true
 git config --global fetch.pruneTags true
 
 

-

 ################
 # Use rebasing #
 ################
 git config --global branch.autosetuprebase always
 ################
 # Use rebasing #
 ################
 git config --global branch.autosetuprebase always

-git config --global rebase.stat true

 git config --global branch.master.rebase true
 git config --global branch.master.rebase true

-
+git config --global rebase.stat true

 
 
 #################
 
 
 #################


@@ -38,6 +36,6 @@ git config --global branch.master.rebase true
 #################
     # Make Git convert all the types of newline to "\n".
     # Might break some stuff.
 #################
     # Make Git convert all the types of newline to "\n".
     # Might break some stuff.

-git config core.autocrlf input
---------------------------------------------------------------------------
+git config --global core.autocrlf true
+----------------------------------------------------------------------

 AUTOGENERATED FILE.
 AUTOGENERATED FILE.