diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-18 00:35:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-18 00:35:50 (GMT) |
| commit | 146120588046e97e52367cad658b42accffa098e (patch) | |
| tree | 96bc17f2fb2f33abe6eebeba589e8c8857d1bc5d | |
| parent | 6ed547b53b90bebd2371b086b83b416b22b243b2 (diff) | |
| parent | 9dcca58db42e85e056c6523429204f367a671a0e (diff) | |
| download | git-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.
| -rwxr-xr-x | generate-cmdlist.sh | 4 | ||||
| -rwxr-xr-x | git-filter-branch.sh | 12 | ||||
| -rw-r--r-- | git-mergetool--lib.sh | 6 | ||||
| -rwxr-xr-x | git-rebase.sh | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index 3ef4861..1093ef4 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -15,8 +15,8 @@ do sed -n ' /^NAME/,/git-'"$cmd"'/H ${ - x - s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/ + x + s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/ p }' "Documentation/git-$cmd.txt" done 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 diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 91f90ac..9a89e8f 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -79,7 +79,7 @@ get_merge_tool_cmd () { fi if diff_mode; then echo "$(git config difftool.$merge_tool.cmd || - git config mergetool.$merge_tool.cmd)" + git config mergetool.$merge_tool.cmd)" else echo "$(git config mergetool.$merge_tool.cmd)" fi @@ -419,7 +419,7 @@ get_merge_tool_path () { fi if diff_mode; then merge_tool_path=$(git config difftool."$merge_tool".path || - git config mergetool."$merge_tool".path) + git config mergetool."$merge_tool".path) else merge_tool_path=$(git config mergetool."$merge_tool".path) fi @@ -429,7 +429,7 @@ get_merge_tool_path () { if test -z "$(get_merge_tool_cmd "$merge_tool")" && ! type "$merge_tool_path" > /dev/null 2>&1; then echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\ - "'$merge_tool_path'" + "'$merge_tool_path'" exit 1 fi echo "$merge_tool_path" diff --git a/git-rebase.sh b/git-rebase.sh index 266a4c1..6759702 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -22,7 +22,7 @@ currently checked out branch is used. Example: git-rebase master~1 topic - A---B---C topic A'\''--B'\''--C'\'' topic + A---B---C topic A'\''--B'\''--C'\'' topic / --> / D---E---F---G master D---E---F---G master ' |