mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
scripts/git: Improve usage documentation for merge-forward and push-all
Part of 31314.
This commit is contained in:
@@ -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 #
|
||||
#################
|
||||
|
||||
Reference in New Issue
Block a user