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.

diff --combined git-filter-branch.sh
index 6b5f2251b6b5f0b9a43e16296c390e991c6fa13a,71d072baafa12e90d994e69c7ad03f1a245fecb6..804a7f4bc912ab0c9c51038456d9abe4216947a5
--- 1/git-filter-branch.sh
--- 2/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@@ -12,7 -12,7 +12,7 @@@
  
  functions=$(cat << \EOF
  warn () {
-         echo "$*" >&2
+       echo "$*" >&2
  }
  
  map()
@@@ -98,11 -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
@@@ -363,7 -363,7 +363,7 @@@ while read commit parents; d
        sed -e '1,/^$/d' <../commit | \
                eval "$filter_msg" > ../message ||
                        die "msg filter failed: $filter_msg"
 -      @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
 +      workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
                $(git write-tree) $parentstr < ../message > ../map/$commit ||
                        die "could not write rewritten commit"
  done <../revs