summaryrefslogtreecommitdiff
path: root/git-filter-branch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-18 00:35:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-18 00:35:50 (GMT)
commit146120588046e97e52367cad658b42accffa098e (patch)
tree96bc17f2fb2f33abe6eebeba589e8c8857d1bc5d /git-filter-branch.sh
parent6ed547b53b90bebd2371b086b83b416b22b243b2 (diff)
parent9dcca58db42e85e056c6523429204f367a671a0e (diff)
downloadgit-146120588046e97e52367cad658b42accffa098e.zip
git-146120588046e97e52367cad658b42accffa098e.tar.gz
git-146120588046e97e52367cad658b42accffa098e.tar.bz2
Merge branch 'js/sh-style'
* js/sh-style: filter-branch.sh: de-dent usage string misc-sh: fix up whitespace in some other .sh files.
Diffstat (limited to 'git-filter-branch.sh')
-rwxr-xr-xgit-filter-branch.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 6b5f225..804a7f4 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -12,7 +12,7 @@
functions=$(cat << \EOF
warn () {
- echo "$*" >&2
+ echo "$*" >&2
}
map()
@@ -98,11 +98,11 @@ set_ident () {
}
USAGE="[--env-filter <command>] [--tree-filter <command>]
- [--index-filter <command>] [--parent-filter <command>]
- [--msg-filter <command>] [--commit-filter <command>]
- [--tag-name-filter <command>] [--subdirectory-filter <directory>]
- [--original <namespace>] [-d <directory>] [-f | --force]
- [<rev-list options>...]"
+ [--index-filter <command>] [--parent-filter <command>]
+ [--msg-filter <command>] [--commit-filter <command>]
+ [--tag-name-filter <command>] [--subdirectory-filter <directory>]
+ [--original <namespace>] [-d <directory>] [-f | --force]
+ [<rev-list options>...]"
OPTIONS_SPEC=
. git-sh-setup