[MacPorts] WorkingWithGit modified

MacPorts noreply at macports.org
Sun Aug 21 00:17:28 PDT 2016

Page "WorkingWithGit" was changed by mk at macports.org
Diff URL: <https://trac.macports.org/wiki/WorkingWithGit?action=diff&version=23>
Revision 23
Comment: move autosetuprebase TBD a little upwards
Index: WorkingWithGit
--- WorkingWithGit (version: 22)
+++ WorkingWithGit (version: 23)
@@ -174,6 +174,9 @@
 Note that L1 and L2 have been modified by this operation; their commit IDs changed because of that. This new state can be pushed back to origin without the need for a merge commit, and the history graph will stay linear. '''We recommend that all developers rebase their changes rather than merge when conflicts occur during pushing.'''
+'''T.B.D.:''' See config setting for {{{branch.autosetuprebase}}} [#Initialsetup above].
 ==== Putting the background knowledge into production ====
 First, get all new commits from the remote repository using `git fetch <remote-name>`, where `<remote-name>` identifies the repository from which you want to fetch and defaults to "origin":
@@ -192,8 +195,6 @@
 '''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

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