git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
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: Sun, 19 Nov 2017 11:12:53 +0900	[thread overview]
Message-ID: <xmqq4lprow2i.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171118161810.16494-1-kaartic.sivaraam@gmail.com> (Kaartic Sivaraam's message of "Sat, 18 Nov 2017 21:48:10 +0530")

>  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

A good change.

>  test -f "$apply_dir"/applying &&
> -	die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
> +	die "$(gettext "It looks like you are in the middle of an am session. Cannot rebase.")"

Probably not, as 'am' alone would be confusing.

    "It looks like 'git am' is in progress. Cannot rebase."

may be a more sensible improvement.


  reply	other threads:[~2017-11-19  2:13 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 [this message]
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

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq4lprow2i.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=kaartic.sivaraam@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).