development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Junio C Hamano 2017-11-27 11:06:39 +09:00
commit 88e2efcbc4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git-rebase.sh
View file

@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
OPTIONS_SPEC="\ OPTIONS_SPEC="\
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>] git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<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 Available options are
v,verbose! display a diffstat of what changed upstream v,verbose! display a diffstat of what changed upstream
@ -216,7 +216,7 @@ run_pre_rebase_hook () {
} }
test -f "$apply_dir"/applying && 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" if test -d "$apply_dir"
then then