From: Junio C Hamano <gitster@pobox.com>
To: Jeremy Morton <admin@game-point.net>
Cc: git@vger.kernel.org
Subject: Re: Proposal: tell git a file has been renamed
Date: Mon, 24 Apr 2023 12:41:45 -0700 [thread overview]
Message-ID: <xmqq8rehdq4m.fsf@gitster.g> (raw)
In-Reply-To: <8fe188a9-c01f-9fb5-5877-8ff508094b22@game-point.net> (Jeremy Morton's message of "Sat, 22 Apr 2023 19:01:45 +0100")
Jeremy Morton <admin@game-point.net> writes:
> The standard answer for this is to rename the file in one commit, then
> make the changes.
Oh, by the way, this is a pure myth that would unlikely be helpful
in the bigger picture.
When you rename and heavily modify the resulting new path because
you have to solve something, such a work would likely be done on the
same topic branch. One step of it may be a pure rename, and other
steps may involve heavily changing the renamed result, or you may
update the contents in the original and the do a rename at the end,
but either way, when you integrate the end result of the whole topic
branch into the master history, what such a merge will see is that
the original file has disappeared and a new file with contents not
at all similar to the disappeared file has appeared. "pure rename
with changes in separate commits" would have no effect when showing
such a history with "git log --first-parent -p" for a birds-eye
view.
next prev parent reply other threads:[~2023-04-24 19:41 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-22 18:01 Proposal: tell git a file has been renamed Jeremy Morton
2023-04-22 18:54 ` rsbecker
2023-04-22 19:44 ` Jeremy Morton
2023-04-22 19:47 ` rsbecker
2023-04-22 19:54 ` Jeremy Morton
2023-04-22 22:09 ` rsbecker
2023-04-23 9:38 ` Erik Cervin Edin
2023-04-23 21:01 ` Kristoffer Haugsbakk
2023-04-24 1:43 ` Chris Torek
2023-04-24 10:10 ` Jeremy Morton
2023-04-24 10:24 ` Chris Torek
2023-04-24 10:49 ` Erik Cervin Edin
2023-04-24 11:17 ` Jeremy Morton
2023-04-24 14:00 ` Erik Cervin Edin
2023-04-24 14:42 ` Jeremy Morton
2023-04-24 19:25 ` Felipe Contreras
2023-04-24 19:44 ` Jacob Keller
2023-04-24 20:00 ` Felipe Contreras
2023-04-26 19:08 ` Jacob Keller
2023-04-26 20:39 ` Junio C Hamano
2023-05-11 13:44 ` Erik Cervin Edin
2023-04-24 18:26 ` Junio C Hamano
2023-04-24 19:41 ` Junio C Hamano [this message]
2023-04-24 20:05 ` Jeremy Morton
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=xmqq8rehdq4m.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=admin@game-point.net \
--cc=git@vger.kernel.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.