Changes between Version 19 and Version 20 of WorkingWithGit

Timestamp:

Aug 21, 2016, 6:55:23 AM (8 years ago)

Author:

mkae (Marko Käning)

Comment:

Add basic setup info based on KDE's configuration hints

WorkingWithGit

@@ -5 +5 @@
 [[PageOutline]]
 
+== Initial setup ==
+
+Start with some basic setup (based on [https://community.kde.org/Infrastructure/Git/Configuration KDE's configuration hints]):
+{{{
+$ git config --global user.name "Your Name"
+$ git config --global user.email YOUR_MACPORTS_HANDLE@macports.org
+#                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+#                         if not registered with a MacPorts handle
+#                                 simply use another email address
+}}}
+
+Additionally one should define a few (not necessarily global) presets for working with your clone of the MacPorts repository:
+{{{
+$ git config --global push.default nothing
+$ git config --global branch.autosetuprebase always
+$ git config --global core.excludesfile ~/.gitignore_global
+$ git config --global commit.template ~/.git-commit-template
+$ git config --global color.ui true
+}}}
+which avoids that you accidentally push changes into a wrong branch at {{{origin}}}, makes sure that your current changes get always auto-rebased ontop of the pulled changes from {{{origin}}}, adds an excludes file as well as a commit template and enables colorizing {{{git}}}'s console output.
+
+'''T.B.D.:''' A MacPorts'ish ignore file {{{.gitignore_global}}} should be supplied here, perhaps based on [http://quickgit.kde.org/?p=macports-kde.git&a=blob&h=14f952f776b9f54263671cc2aba5886c6ebee75b&hb=120899f859eefbe0bf669685352e7c44a834e23f&f=contrib%2Fgit-setup%2F.git-commit-template this]?!!
+
+'''T.B.D.:''' A git commit template file {{{.git-commit-template}}} should be supplied here, perhaps based on [https://quickgit.kde.org/?p=macports-kde.git&a=blob&h=14f952f776b9f54263671cc2aba5886c6ebee75b&hb=120899f859eefbe0bf669685352e7c44a834e23f&f=contrib%2Fgit-setup%2F.git-commit-template this]?!!
+
+'''T.B.D.:''' To make life easier when working with a couple of remotes one should define also some URL renaming for the MacPorts repo as it gets done e.g. for KDE like this:
+{{{
+[url "git://anongit.kde.org/"]
+        insteadOf = kde:
+[url "git@git.kde.org:"]
+        pushInsteadOf = kde:
+}}}
+which needs an update once it's clear which URL the MacPorts `git` repo is going to have.
+
+
 == Common `git` tasks while working with ports ==
 
-To start:
+Then
 {{{
 svn checkout https://svn.macports.org/repository/macports/trunk/dports