[MacPorts] WorkingWithGit modified

MacPorts noreply at macports.org
Tue Jan 31 18:43:13 UTC 2017

Page "WorkingWithGit" was changed by neverpanic
Diff URL: <https://trac.macports.org/wiki/WorkingWithGit?action=diff&version=75>
Revision 75
Comment: When merging back into master with git merge --ff-only, you should grab the diff between origin/master and master, espeically since that's what's going to be pushed
Index: WorkingWithGit
--- WorkingWithGit (version: 74)
+++ WorkingWithGit (version: 75)
@@ -182,7 +182,7 @@
 - check that only your expected commits are about to be pushed
-git log origin/master..foobar
+git log origin/master..master

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

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 admin at macports.org.

More information about the macports-changes mailing list