From: Junio C Hamano <gitster@pobox•com>
To: Kaartic Sivaraam <kaartic.sivaraam@gmail•com>
Cc: Git mailing list <git@vger•kernel.org>
Subject: Re: [PATCH] git-rebase: clean up dashed-usages in messages
Date: Tue, 21 Nov 2017 09:33:33 +0900 [thread overview]
Message-ID: <xmqqbmjwlbc2.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171120152652.9413-1-kaartic.sivaraam@gmail.com> (Kaartic Sivaraam's message of "Mon, 20 Nov 2017 20:56:52 +0530")
Kaartic Sivaraam <kaartic.sivaraam@gmail•com> writes:
> Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail•com>
> ---
Thanks. Two fewer git-foo exposed to the end user. Good ;-)
> git-rebase.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 6344e8d5e..2f5d138a0 100755
> --- 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>]
> -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
> @@ -216,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
prev parent reply other threads:[~2017-11-21 0:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-18 16:18 [PATCH] git-rebase: clean up dashed-usages in messages Kaartic Sivaraam
2017-11-19 2:12 ` Junio C Hamano
2017-11-19 17:28 ` Kaartic Sivaraam
2017-11-20 0:26 ` Junio C Hamano
2017-11-20 15:26 ` Kaartic Sivaraam
2017-11-21 0:33 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbmjwlbc2.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kaartic.sivaraam@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox