chiark / gitweb /
tip => same
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 28 Jan 2012 19:49:12 +0000 (19:49 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 28 Jan 2012 19:49:12 +0000 (19:49 +0000)
topbloke-merge-driver

index 891bfa4..a3d1999 100755 (executable)
@@ -4,7 +4,8 @@ set -e
 fail () { echo >&2 "$0: $*"; exit 127; }
 
 case "$1" in
---v1) how=tip ;;               # merge into tip from another tip of this patch
+--v1) how=same ;;              # merge into tip from another tip of this patch
+                               #  or into base from another base of this patch
 --v1-base) how=base ;;         # merge into tip from a base of this patch
 --v1-dep) how=dep ;;           # merge into base from a dep's tip
 *) fail "bad usage" ;;
@@ -31,13 +32,13 @@ base.deps)
 base.props)
        exec topbloke-merge-lists -M$markersize -P -UDeleted "$@"
        ;;
-tip.msg)
+same.msg)
        exec git-merge-file --marker-size=$markersize "$@"
        ;;
-tip.deps|*.included)
+same.deps|*.included)
        exec topbloke-merge-lists -M$markersize "$@"
        ;;
-tip.props|*.pprops)
+same.props|*.pprops)
        exec topbloke-merge-lists -M$markersize -P "$@"
        ;;
 *)