diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-07-17 12:24:01 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-07-17 12:24:01 -0400 |
commit | 040199319726d88a7730d7419e6fb26a7187ca5d (patch) | |
tree | 15dcd61241b216e112d452c97cd4a91966d35b27 /scripts/git/git-install-tools.sh | |
parent | 2225c3c36942e09594333758c7ce7d463d988f0e (diff) | |
download | tor-040199319726d88a7730d7419e6fb26a7187ca5d.tar.gz tor-040199319726d88a7730d7419e6fb26a7187ca5d.zip |
Add git-resquash.sh to repository
This differs from my old git-resquash.sh in that it uses the newer
`git rebase --keep-base` if available
Diffstat (limited to 'scripts/git/git-install-tools.sh')
-rwxr-xr-x | scripts/git/git-install-tools.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/git/git-install-tools.sh b/scripts/git/git-install-tools.sh index 3b9c3d79f3..d74f8475af 100755 --- a/scripts/git/git-install-tools.sh +++ b/scripts/git/git-install-tools.sh @@ -3,7 +3,7 @@ SCRIPT_NAME=$(basename "$0") SCRIPTS_DIR=$(dirname "$0") -TOOL_NAMES=(push-all pull-all merge-forward list-tor-branches) +TOOL_NAMES=(push-all pull-all merge-forward list-tor-branches resquash) function usage() { |