play=.git/tartree-edit-work
git_manip_play () {
- local wd=$(pwd)
+ local wd; wd=$(pwd)
case "$wd" in
*.edit) fail "bad idea to run gitfetchinfo into a .edit tree!" ;;
esac
?.-*) fail "no options understood" ;;
*) fail "usage:
tartree-edit edit|done DIRECTORY|TARBALL
- tartree-edit gitfetchinfo DIRECTORY|TARBALL REMOTE" ;;
+ tartree-edit gitfetchinfo DIRECTORY|TARBALL REMOTE
+ tartree-edit gitfetchinfo-merge REMOTE-A REMOTE-B" ;;
+ # we don't document gitfetchinfo-diff because it's rather poor
esac
case "$arg" in
exec 3<&-
fi
- local innerwd="$(echo $play/*)"
+ local innerwd; innerwd="$(echo $play/*)"
git for-each-ref --format='%(refname)' refs/remotes >$play/l
perl -w -ne '