From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Nov 2017 02:06:39 +0000 (+0900)
Subject: Merge branch 'ks/rebase-no-git-foo'
X-Git-Tag: v2.16.0-rc0~93
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/88e2efcbc415f234d38e6e1c59c8d8ae03c989b3?hp=-c

Merge branch 'ks/rebase-no-git-foo'

Mentions of "git-rebase" and "git-am" (dashed form) still remained
in end-user visible strings emitted by the "git rebase" command;
they have been corrected.

* ks/rebase-no-git-foo:
git-rebase: clean up dashed-usages in messages
---

88e2efcbc415f234d38e6e1c59c8d8ae03c989b3
diff --combined git-rebase.sh
index aabbf6b69e,7dccc4c5f8..60b70f3def
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -9,7 -9,7 +9,7 @@@ OPTIONS_STUCKLONG=
  OPTIONS_SPEC="\
  git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
  git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
- git-rebase --continue | --abort | --skip | --edit-todo
+ git rebase --continue | --abort | --skip | --edit-todo
  --
   Available options are
  v,verbose!         display a diffstat of what changed upstream
@@@ -55,10 -55,9 +55,10 @@@ LF=
  '
  ok_to_skip_pre_rebase=
  resolvemsg="
 -$(gettext 'When you have resolved this problem, run "git rebase --continue".
 -If you prefer to skip this patch, run "git rebase --skip" instead.
 -To check out the original branch and stop rebasing, run "git rebase --abort".')
 +$(gettext 'Resolve all conflicts manually, mark them as resolved with
 +"git add/rm <conflicted_files>", then run "git rebase --continue".
 +You can instead skip this commit: run "git rebase --skip".
 +To abort and get back to the state before "git rebase", run "git rebase --abort".')
  "
  unset onto
  unset restrict_revision
@@@ -74,7 -73,6 +74,7 @@@ test "$(git config --bool rebase.stat)
  autostash="$(git config --bool rebase.autostash || echo false)"
  fork_point=auto
  git_am_opt=
 +git_format_patch_opt=
  rebase_root=
  force_rebase=
  allow_rerere_autoupdate=
@@@ -166,7 -164,7 +166,7 @@@ apply_autostash () 
  	if test -f "$state_dir/autostash"
  	then
  		stash_sha1=$(cat "$state_dir/autostash")
 -		if git stash apply $stash_sha1 2>&1 >/dev/null
 +		if git stash apply $stash_sha1 >/dev/null 2>&1
  		then
  			echo "$(gettext 'Applied autostash.')" >&2
  		else
@@@ -216,7 -214,7 +216,7 @@@ run_pre_rebase_hook () 
  }
  
  test -f "$apply_dir"/applying &&
- 	die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
+ 	die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
  
  if test -d "$apply_dir"
  then
@@@ -350,9 -348,6 +350,9 @@@ d
  		shift
  		break
  		;;
 +	*)
 +		usage
 +		;;
  	esac
  	shift
  done
@@@ -449,11 -444,6 +449,11 @@@ els
  	state_dir="$apply_dir"
  fi
  
 +if test -t 2 && test -z "$GIT_QUIET"
 +then
 +	git_format_patch_opt="$git_format_patch_opt --progress"
 +fi
 +
  if test -z "$rebase_root"
  then
  	case "$#" in