diff options
| author | teor <teor@torproject.org> | 2019-08-29 22:52:21 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-29 22:52:21 +1000 |
| commit | 664e6a392ed0ace86e0182dc25bf365e8e34ed9d (patch) | |
| tree | ab07f4ad6b5bedcaed8ef3b31f3a6a3cb171fd26 /scripts/git/git-merge-forward.sh | |
| parent | b47b71ad2fc095b43437317011d127424188eb4f (diff) | |
| download | tor-664e6a392ed0ace86e0182dc25bf365e8e34ed9d.tar.gz tor-664e6a392ed0ace86e0182dc25bf365e8e34ed9d.zip | |
scripts/git: Improve usage documentation for merge-forward and push-all
Part of 31314.
Diffstat (limited to 'scripts/git/git-merge-forward.sh')
| -rwxr-xr-x | scripts/git/git-merge-forward.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index a7e797eaf0..b9591eaa7e 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,5 +1,17 @@ #!/usr/bin/env bash +# Usage: git-merge-forward.sh -n -t <test-branch-prefix> -u +# arguments: +# -n: dry run mode +# -t: test branch mode: create new branches from the commits checked +# out in each maint directory. Call these branches prefix_029, +# prefix_035, ... , prefix_master. +# -u: in test branch mode, if a prefix_* branch exists, skip creating +# that branch. Use after a merge error, to restart the merge +# forward at the first unmerged branch. +# env vars: +# See the Configuration section for env vars and their default values. + ################# # Configuration # ################# |