Add git-upstream-sync

Author: unixorn

README.md

@@ -129,6 +129,7 @@ git clone this repository, then add it to your `$PATH`. Nothing here actually re
 * git-unpushed - Zach Holman's [dotfiles](https://github.com/holman/dotfiles)
 * git-unreleased - Mislav Marohnić's [dotfiles](https://github.com/mislav/dotfiles)
 * git-up - Ryan Tomayko's [dotfiles](http://github.com/rtomayko/dotfiles)
+* git-upstream-sync - One of my personal scripts
 * git-when-merged - Michael Haggerty [git-when-merged](https://github.com/mhagger/git-when-merged)
 * git-where - Mislav Marohnić's [dotfiles](https://github.com/mislav/dotfiles)
 * git-winner - Garry Dolley [https://github.com/up_the_irons/git-winner](https://github.com/up_the_irons/git-winner)

git-upstream-sync

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# Author: Joe Block <jpb@unixorn.net>
+# License: Apache 2.0
+# https://github.com/unixorn/git-extra-commands/blob/master/LICENSE
+#
+# Sync to upstream/yourforkname and rebase into your local fork. then push
+#
+# Assumes that your upstream fork's remote is named upstream
+
+branch_name=$(git symbolic-ref --short -q HEAD)
+
+git fetch upstream && \
+  git rebase upstream/${branch_name} && \
+  git push && \
+  git fetch -p