git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Erik Cervin Edin <erik@cervined.in>
To: Philip Oakley <philipoakley@iee.email>
Cc: djvortex@gmx.com, git@vger.kernel.org
Subject: Re: Handling rebasing better
Date: Wed, 19 Oct 2022 15:30:16 +0200	[thread overview]
Message-ID: <CA+JQ7M-48KZmnqFYfWvNeoFTxFrQAndwEZf7uuMxOw9PZSHktg@mail.gmail.com> (raw)
In-Reply-To: <53a8b40f-1740-581f-e2df-709b13046ffc@iee.email>

On Thu, Sep 22, 2022, 1:34 PM <djvortex@gmx.com> wrote
>
> Perhaps git could even support the "reset-to-the-remote-history and then cherry-pick your new local commits" directly, to help the developer in this task (so that you don't need to write down any hashes and do all that manually). But even if this isn't really feasible, at least detecting the situation and the clearer messages would help enormously.


Are you aware of
  git pull --rebase
?

  reply	other threads:[~2022-10-19 13:50 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-22 11:23 Handling rebasing better djvortex
2022-10-19 12:27 ` Philip Oakley
2022-10-19 13:30   ` Erik Cervin Edin [this message]
     [not found]     ` <trinity-1b24da2a-4ee4-420b-9cef-e88a8bbcb385-1666770562213@3c-app-mailcom-bs12>
2022-10-26  8:31       ` Erik Cervin Edin

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=CA+JQ7M-48KZmnqFYfWvNeoFTxFrQAndwEZf7uuMxOw9PZSHktg@mail.gmail.com \
    --to=erik@cervined.in \
    --cc=djvortex@gmx.com \
    --cc=git@vger.kernel.org \
    --cc=philipoakley@iee.email \
    /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).