git-remote() {
  [[ "$GIT_DEBUG" == 1 ]] && set -x
  base_cmd=("$GIT_CMD" remote)
  opts=()
  args=()
  for x in "$@"; do
    if [[ "${x[1]}" == "-" ]]; then
      opts=("${opts[@]}" "$x")
    else
      args=("${args[@]}" "$x")
    fi
  done
  if (( $#args >= 2 )) {
       a=${args[1]};
       b=${args[2]};
       shift 2 args;
       args=("$a" "${args[@]}")
       if (( $#opts > 0 )); then
         "${base_cmd[@]}" "$b" "${opts[@]}" "${args[@]}"
       else
         "${base_cmd[@]}" "$b" "${args[@]}"
       fi
     } else {
       "${base_cmd[@]}" "$@"
     }
     [[ "$GIT_DEBUG" == 1 ]] && set +x
}