From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Aleksey Bykov <aleksey.bykov@gmail.com>, git@vger.kernel.org
Subject: Re: The original file that was split in 2 other files, is there a way in git to see what went where?
Date: Tue, 23 Jan 2018 10:37:53 -0800 [thread overview]
Message-ID: <xmqq8tcoifpa.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20180123165545.GI13068@sigill.intra.peff.net> (Jeff King's message of "Tue, 23 Jan 2018 11:55:45 -0500")
Jeff King <peff@peff.net> writes:
> On Mon, Jan 22, 2018 at 10:22:21PM -0500, Aleksey Bykov wrote:
>
>> I am a code reviewer, I have a situation in GIT:
>>
>> - before: a.txt
>>
>> Then a developer decided to split the content of a.txt into 2 files
>> and add a few changes all in one commit:
>>
>> - after: b.txt + few changes and c.txt + few changes
>> ...
> For seeing which line came from where, you might try "git blame -C",
> which will cross file boundaries looking for the source of lines.
> ...
> And finally, if you're going to do a lot with "git blame", I'd look into
> the "tig" tool as a prettier interface. You should be able to do "tig
> blame -C ..." in the same way.
All excellent guides. "blame" is good at explaining where things
came from, but not as good at explaining, starting from an old
state, where things went. "blame --reverse" does a decent job
within the constraints its output format has, but not quite ideal.
prev parent reply other threads:[~2018-01-23 18:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAMAMitCV3xvaSr00H574Pww=r_c3=0NqT1Ge13kc=gWJqDJ3Ug@mail.gmail.com>
2018-01-23 3:22 ` The original file that was split in 2 other files, is there a way in git to see what went where? Aleksey Bykov
2018-01-23 16:32 ` Jonathan Tan
2018-01-23 16:55 ` Jeff King
2018-01-23 18:37 ` 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
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=xmqq8tcoifpa.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=aleksey.bykov@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).