From ec981cb46fa43eab3511a97efc2cd0dba5141d2e Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 16 Feb 2017 13:48:01 -0700 Subject: comment --- bin/git-pull-safe | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'bin/git-pull-safe') diff --git a/bin/git-pull-safe b/bin/git-pull-safe index f92f319f..9ce00cb0 100755 --- a/bin/git-pull-safe +++ b/bin/git-pull-safe @@ -2,8 +2,13 @@ # Update all remote-tracking branches, and as many local branches that # we can fast-forward. Additionally, if the current branch looks like -# a dgit suite-tracking branch, merge the current contents of the -# Debian archive into the current branch +# a dgit suite-tracking branch, merge into it the current state of the +# package in the Debian archive + +# This script is based on the value of git_update set by the myrepos +# dgit plugin. That library uses an unconditional `git pull` to match +# global myrepos conventions. The main reason for having that script +# is to override that unconditional `git pull` set -e -- cgit v1.2.3