Merge pull request #4 from richardkchapman/gitparent

Added git-parent

Author: richardkchapman

rkc/git-parent

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Work out which candidate branch this one was probably forked from
+
+best=1000000
+parent=
+
+for candidate in `git branch | grep ' candidate-' | sed 's/\*//'` master ; do
+  delta=$(git rev-list --count --no-merges $candidate...HEAD)
+  #echo $candidate : $delta
+  if [ $delta -lt $best ] ; then
+    best=$delta
+    parent=$candidate
+  fi
+done
+if [ -z $parent ] ; then
+  exit 2
+fi
+echo $parent

rkc/git-pr

@@ -5,7 +5,7 @@ if [ "$#" -ge 1 ] ; then
   into=$1
   shift 1
 else
-  into=master
+  into=$(git parent)
 fi
 remote="$(git remote | grep rkc)"
 if [ "$remote" = "" ]; then

rkc/git-update

@@ -9,7 +9,7 @@ else
 fi
 echo "Fetching data from $remote"
 git fetch $remote
-for candidate in `git branch | grep ' candidate-' | sed 's/\*//'` master stable
+for candidate in `git branch | sed 's/\*/ /' | grep -E ' candidate-| master$| stable$' | sed 's/\*//'`
 do
   git merge-ff -q $candidate $remote/$candidate
 done