add git-gpick tool

this tool complements the gpush tool in that it provides a convenient
way to synchronize with gerrit.

this first version just sheepishly replaces the named local commits with
the current patchset from gerrit.

Change-Id: I21f8ef385d1793757149dfa5cc69e4e907cb1c04
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/bin/git-gpush b/bin/git-gpush
index e583ac5..9b67285 100755
--- a/bin/git-gpush
+++ b/bin/git-gpush
@@ -740,7 +740,7 @@ sub print_errors($)
     fail_push($group, "Giving up - push is going to be rejected.\n")
         if ($have_rejected);
     fail_push($group, "Local state is out of sync with Gerrit.\n",
-                      "Please specify --force to push nonetheless.\n")
+                      "Please use git gpick, or specify --force to push nonetheless.\n")
         if ($need_force && !$force);
 }
 
@@ -924,6 +924,6 @@ sub execute_pushing()
 process_config();
 parse_arguments(@ARGV);
 goto_gitdir();
-load_state();
+load_state(0);
 execute_pushing();
 save_state($dry_run);