there really is a chain going all the way back to master. bummer. however, i think you can get all of the pending updates from upstream with a pull --all. trying that now.
if test_writeable ".git"; then
$blatt
retval=0
if test_writeable ".git"; then
$blatt
retval=0
- local myself="$(my_branch_name)"
- local parent="$(parent_branch_name)"
-
- if [ "$myself" != "$parent" ]; then
- git pull origin "$parent" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+# local myself="$(my_branch_name)"
+# local parent="$(parent_branch_name)"
+#
+# if [ "$myself" != "$parent" ]; then
+# git pull origin "$parent" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+# retval+=${PIPESTATUS[0]}
+# else
+
+ git pull --all 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
- else
- git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
- retval+=${PIPESTATUS[0]}
- fi
fi
else
# this is not an error necessarily; we'll just pretend they planned this.
fi
else
# this is not an error necessarily; we'll just pretend they planned this.