git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: zhang kai <kylerzhang11@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Update message_advice_pull_before_push to mention how to push after rebasing
Date: Fri, 29 Mar 2024 15:41:03 +0800	[thread overview]
Message-ID: <CAK_130R-AM6ZKJe52hc_XaLwi++VKm_bW5Ar8m8Yo7JLUnt9Yw@mail.gmail.com> (raw)
In-Reply-To: <xmqq5xx6uume.fsf@gitster.g>

> True, but isn't that a slipperly slope to cram more and more of the
> material from the manual into the "hint" that is supposed to be
> short, helpful and not so obnoxious?  Perhaps removing "pull again
> before you push", and saying "updates were rejected because X; see
> the note about fast-forwards in the manual" and nothing else would
> be an improvement?

I agree. Removing "pull again before you push" is definitely an
improvement for our workflow. But I know some teams don't use rebase
at all, so it may not be ideal for them.


      reply	other threads:[~2024-03-29  7:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-28  9:54 Update message_advice_pull_before_push to mention how to push after rebasing zhang kai
2024-03-28 11:49 ` Rubén Justo
2024-03-28 15:23 ` Junio C Hamano
2024-03-28 17:19   ` zhang kai
2024-03-28 17:35     ` Junio C Hamano
2024-03-29  7:41       ` zhang kai [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

  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=CAK_130R-AM6ZKJe52hc_XaLwi++VKm_bW5Ar8m8Yo7JLUnt9Yw@mail.gmail.com \
    --to=kylerzhang11@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).