Revision adda3c3beb0a244719becb1895e16227b0393bd1 authored by Marc Branchaud on 12 April 2010, 16:28:13 UTC, committed by Junio C Hamano on 12 April 2010, 16:50:09 UTC
Also move -X's description next to -s's in merge-options.txt. This makes it easier to learn how to specify merge strategy options. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fcd4240
fixup-builtins
#!/bin/sh
while [ "$1" ]
do
if [ "$1" != "git-sh-setup" -a "$1" != "git-parse-remote" -a "$1" != "git-svn" ]; then
old="$1"
new=$(echo "$1" | sed 's/git-/git /')
echo "Converting '$old' to '$new'"
sed -i "s/\\<$old\\>/$new/g" $(git ls-files '*.sh')
fi
shift
done
sed -i 's/git merge-one-file/git-merge-one-file/g
s/git rebase-todo/git-rebase-todo/g' $(git ls-files '*.sh')
git update-index --refresh >& /dev/null
exit 0
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...