Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-rebase: clean up dashed-usages in messages
author
Kaartic Sivaraam
<kaartic.sivaraam@gmail.com>
Mon, 20 Nov 2017 15:26:52 +0000
(20:56 +0530)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 21 Nov 2017 00:34:13 +0000
(09:34 +0900)
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
42e6fde
)
diff --git
a/git-rebase.sh
b/git-rebase.sh
index 2cf73b88e8e83ca34b9eb319dbc2b0a220139b0f..7dccc4c5f806ef7f5bd68ce0842998a17b05a68b 100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-9,7
+9,7
@@
OPTIONS_STUCKLONG=t
OPTIONS_SPEC="\
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
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
--
Available options are
v,verbose! display a diffstat of what changed upstream
@@
-214,7
+214,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"
then
if test -d "$apply_dir"
then