Add git-reup and friends

git_merge_base_tag.py

+#!/usr/bin/env python
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+import sys
+
+from subprocess2 import CalledProcessError
+
+from git_common import nuke_merge_base_tag, manual_merge_base_tag
+
+
+def main(argv):
+  # TODO(iannucci): Use argparse
+  assert len(argv) <= 2, "Must supply merge base or no arg."
+  if len(argv) == 2:
+    manual_merge_base_tag('HEAD', argv[1])
+  else:

[agable, 2014/02/28 20:14:16]

"git merge-base-tag other-branch" creates a tag.
"git merge-base-tag" removes a tag.

That's semantically crazy. You need to enforce "-d" or something like that to
remove the tag, like removing branches.

In fact, I'd say "git merge-base-tag other-branch" should create a tag, "git
merge-base-tag -d other-branch" should remove the merge-base tag with that other
branch, and any merge-base-tag command without a branch name should assume HEAD.

+    try:
+      nuke_merge_base_tag('HEAD')
+    except CalledProcessError:
+      print "No merge base tag currently exists for this branch."
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))
+
+