aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-31 18:34:42 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-31 18:34:42 -0400
commit1652aeabff3f0579fd3929b2cffbe574b887b70a (patch)
tree51c0442cc64e286c66991c08b6932b0f6df01bf6 /contrib
parent3363a0d26e553378084415b1bcc67c36929d9c07 (diff)
downloadtor-1652aeabff3f0579fd3929b2cffbe574b887b70a.tar
tor-1652aeabff3f0579fd3929b2cffbe574b887b70a.tar.gz
Document the --branch argument to contrib/findMergedChanges.pl
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/findMergedChanges.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl
index 46e070f94..e4ff6163e 100755
--- a/contrib/findMergedChanges.pl
+++ b/contrib/findMergedChanges.pl
@@ -19,7 +19,7 @@ my $look_for_type = "merged";
if (! @ARGV) {
print <<EOF
Usage:
- findMergedChanges.pl [--merged/--unmerged/--weird/--list] changes/*
+ findMergedChanges.pl [--merged/--unmerged/--weird/--list] [--branch=<branchname] changes/*
A change is "merged" if it has ever been merged to release-0.2.2 and it has had
no subsequent changes in master.