[MacPorts] WorkingWithGit modified

MacPorts noreply at macports.org
Fri Aug 26 11:21:54 PDT 2016

Page "WorkingWithGit" was changed by cal at macports.org
Diff URL: <https://trac.macports.org/wiki/WorkingWithGit?action=diff&version=48>
Revision 48
Comment: Move commit.template config option to commit message section, remove global ignore option, which I don't think we need for MacPorts
Index: WorkingWithGit
--- WorkingWithGit (version: 47)
+++ WorkingWithGit (version: 48)
@@ -17,17 +17,6 @@
 git config --global user.email YOUR_MACPORTS_HANDLE at macports.org
 If you work on multiple Git projects and do not want to modify your email address for those, these commands can also be run without `--global` in a clone of MacPorts' repositories to only change the option for these repositories. If you are not a MacPorts committer, use any email address.
-Additionally one should define a few (very likely not necessarily global) presets for working with your clone of the MacPorts repository:
-git config --global core.excludesfile ~/.gitignore_global
-git config --global commit.template ~/.git-commit-template
-which adds an excludes file as well as a commit template.
-'''T.B.D.:''' A MacPorts'ish ignore file {{{.gitignore_global}}} should be supplied here, perhaps based on [https://quickgit.kde.org/?p=macports-kde.git&a=blob&h=bb618b30d4daba183823b797fa56ae65b207c569&hb=120899f859eefbe0bf669685352e7c44a834e23f&f=contrib%2Fgit-setup%2F.gitignore_global 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.:''' MacPorts ports contributors should be encouraged to fork the original MacPorts {{{git}}} repository and introduce changes only in their forked repos. Contributions can then be "filed" to the original repo using GitHub's pull requests (PR). These PRs allow for user-friendly reviewing, commenting and in the future possibly also immediate issuing of CI builds.
@@ -205,7 +194,7 @@
  1. Wrap the body at 72 characters
  1. Use the body to explain what and why vs. how
-'''T.B.D.:''' See todo on {{{~/.git-commit-template}}} [#Initialsetup above].
+If you don't want to remember these rules, you can configure your git client to load a template whenever it prompts you for a commit message by setting the `commit.template` `git-config(1)` option. The KDE developers [https://quickgit.kde.org/?p=macports-kde.git&a=blob&h=14f952f776b9f54263671cc2aba5886c6ebee75b&f=contrib%2Fgit-setup%2F.git-commit-template&o=plain have a nice example].
 === Reverting changes === #revert
 Subversion has two methods for reverting changes: `svn revert`, which drops uncommitted local modifications and restores the committed state and `svn merge -c -12345` to undo committed changes.

Page URL: <https://trac.macports.org/wiki/WorkingWithGit>
MacPorts <https://www.macports.org/>
Ports system for OS X

This is an automated message. Someone added your email address to be
notified of changes on 'WorkingWithGit' page.
If it was not you, please report to .

More information about the macports-changes mailing list