Skip to content

Instantly share code, notes, and snippets.

@anddam
Created January 25, 2017 17:24
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anddam/58d86bb3cc457624888205b8f15de705 to your computer and use it in GitHub Desktop.
Save anddam/58d86bb3cc457624888205b8f15de705 to your computer and use it in GitHub Desktop.
anddam@bibook /opt/macports/ports-git/shells/xonsh master $ git help rebase
anddam@bibook /opt/macports/ports-git/shells/xonsh master $ git branch
* master
wip
xonsh-update-0.5.2
anddam@bibook /opt/macports/ports-git/shells/xonsh master $ git log upstream/master..xonsh-update-0.5.2
commit 4e2dad4b799dc60bb39617baab435e3302dc6ea3
Author: Andrea D'Amore <and.damore@macports.org>
Date: Wed Jan 25 17:51:18 2017 +0100
port xonsh: upgrade to 0.5.2, add variants for python 3.4 and 3.6; nomaintainer
anddam@bibook /opt/macports/ports-git/shells/xonsh xonsh-update-0.5.2 $ git log upstream/master..xonsh-update-0.5.2
commit 4e2dad4b799dc60bb39617baab435e3302dc6ea3
Author: Andrea D'Amore <and.damore@macports.org>
Date: Wed Jan 25 17:51:18 2017 +0100
port xonsh: upgrade to 0.5.2, add variants for python 3.4 and 3.6; nomaintainer
anddam@bibook /opt/macports/ports-git/shells/xonsh xonsh-update-0.5.2 $ git rebase
There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-rebase(1) for details.
git rebase <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=<remote>/<branch> xonsh-update-0.5.2
anddam@bibook /opt/macports/ports-git/shells/xonsh xonsh-update-0.5.2 [1]$ git checkout master
Your branch is up-to-date with 'upstream/master'.
Switched to branch 'master'
anddam@bibook /opt/macports/ports-git/shells/xonsh master $ git rebase xonsh-update-0.5.2
First, rewinding head to replay your work on top of it...
Applying: wireshark2: update to version 2.2.4
Applying: nginx: update to version 1.11.9
Applying: zsync: Add license, fix livecheck, add sha256 hash
Applying: WW: Update to version 1.3
Applying: qemu: Update to version 2.8.0
anddam@bibook /opt/macports/ports-git/shells/xonsh master $ git log -6
commit 0ea16ac9ee3928eddf8baaef3dc302d20be3f603
Author: Rainer Müller <raimue@macports.org>
Date: Wed Jan 25 15:53:02 2017 +0100
qemu: Update to version 2.8.0
commit aba292b9f7b4d44ced035101598c37f0a5fb5e79
Author: Frank Schima <mf2k@macports.org>
Date: Wed Jan 25 07:47:46 2017 -0700
WW: Update to version 1.3
Closes: https://trac.macports.org/ticket/53386
commit 3cd56f07ca340c3c24c4d89ebe58f90204c3315d
Author: Clemens Lang <neverpanic@gmail.com>
Date: Wed Jan 25 13:07:25 2017 +0100
zsync: Add license, fix livecheck, add sha256 hash
commit 8f93da55aaec504315a31db94c32770a41826b3b
Author: Marius Schamschula <mps@macports.org>
Date: Wed Jan 25 05:57:21 2017 -0600
nginx: update to version 1.11.9
commit 526df92f12578c5325b3545cf09c11bbdb8a1bad
Author: Marius Schamschula <mps@macports.org>
Date: Tue Jan 24 18:17:23 2017 -0600
wireshark2: update to version 2.2.4
commit 4e2dad4b799dc60bb39617baab435e3302dc6ea3
Author: Andrea D'Amore <and.damore@macports.org>
Date: Wed Jan 25 17:51:18 2017 +0100
port xonsh: upgrade to 0.5.2, add variants for python 3.4 and 3.6; nomaintainer
anddam@bibook /opt/macports/ports-git/shells/xonsh master $ git help rebase
anddam@bibook /opt/macports/ports-git/shells/xonsh master $ git branch
* master
wip
xonsh-update-0.5.2
anddam@bibook /opt/macports/ports-git/shells/xonsh master $ git log upstream/master..xonsh-update-0.5.2
commit 4e2dad4b799dc60bb39617baab435e3302dc6ea3
Author: Andrea D'Amore <and.damore@macports.org>
Date: Wed Jan 25 17:51:18 2017 +0100
port xonsh: upgrade to 0.5.2, add variants for python 3.4 and 3.6; nomaintainer
anddam@bibook /opt/macports/ports-git/shells/xonsh master $
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment