[MacPorts] WorkingWithGit modified

MacPorts noreply at macports.org
Sun Aug 21 00:08:18 PDT 2016

Page "WorkingWithGit" was changed by mk at macports.org
Diff URL: <https://trac.macports.org/wiki/WorkingWithGit?action=diff&version=21>
Revision 21
Comment: insert more TBD's in text flow related to basic setup
Index: WorkingWithGit
--- WorkingWithGit (version: 20)
+++ WorkingWithGit (version: 21)
@@ -4,7 +4,7 @@
-== Initial setup ==
+== Initial setup == #Initialsetup
 Start with some basic setup (based on [https://community.kde.org/Infrastructure/Git/Configuration KDE's configuration hints]):
@@ -119,6 +119,9 @@
 Note that the push will fail if the remote repository has new changes. Contrary to Subversion, it does not matter whether your changes conflict with the remote ones. If this happens, you must update your local working copy as described in the [#updating section on fetch the latest changes] and re-try the push.
+'''T.B.D.:''' See config setting for {{{push.default}}} [#Initialsetup above], which requires the user to explicitly state the target branch, i.e. it should now be e.g. {{{git push origin master}}}.
 === Merge a single change from master into a release branch === #cherrypick
 The equivalent to Subversion's `svn merge -c <revision> .` is `git cherry-pick`. Use `git cherry-pick` to apply a single change from master to a release branch. To do this, look up the commit ID of the commit you want to pick:
@@ -138,6 +141,7 @@
 git push [origin <branchname>]
+'''T.B.D.:''' Here as well see config setting for {{{push.default}}} [#Initialsetup above] requiring a target branch, i.e. it should now be e.g. {{{git push origin master}}}.
 == Common `git` tasks & notes about MacPorts' Subversion export ==
 === Fetching the latest changes === #updating
@@ -190,6 +194,9 @@
 '''Note:''' `git rebase` requires that you do not have uncommitted modifications in your working copy. If you have modifications, you can temporarily save them using `git stash` and restore them after the rebase using `git stash pop`.
 '''Warning:''' `git pull` without the `--rebase` flag is a shorthand for `git fetch && git merge origin/master`, which will automatically create a merge commit if it thinks that's necessary.
+'''T.B.D.:''' See config setting for {{{branch.autosetuprebase}}} [#Initialsetup above].
 === Commit messages === #commitmessages
 There are a number of conventions to writing Git commit messages. For a detailed explanation, see http://chris.beams.io/posts/git-commit/. As a tl;dr, here are seven short rules:
@@ -201,6 +208,8 @@
  1. Use the imperative mood in the subject line
  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].
 === 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