From: Junio C Hamano <gitster@pobox.com>
To: Martin von Zweigbergk <martinvonz@gmail.com>
Cc: git@vger.kernel.org, Ramkumar Ramachandra <artagnon@gmail.com>
Subject: Re: [PATCH 2/2] learn to pick/revert into unborn branch
Date: Sun, 23 Dec 2012 11:35:16 -0800 [thread overview]
Message-ID: <7vvcbso93f.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7v4njcpof8.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Sun, 23 Dec 2012 11:18:51 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> Yes, and I do not think it is an implementation detail.
>
> I am not opposed to an "internal use" of the cherry-pick machinery to
> implement a corner case of "rebase -i":
> ...
> In step 4., you would be internally using the cherry-pick machinery
> to implement the step of "rebase -i" sequence. That is what I would
> call an implementation detail. And that is cherry-picking to the
> root. It transplants something that used to depend on the entire
> history behind it ...
Just to add another example, I do not think I would be opposed to
the case where you "edit" the root commit in the above example,
i.e. keeping the "Hello world" as the root commit, but modifying its
tree and/or log message. The internal impemenation detail has to
first chery-pick that existing commit on top of a void state before
it gives the user a chance to tweak the tree and commit the result
with a modified log message. Just like "commit --amend" can be used
to amend the root commit, it logically makes sense the recreated
commit records nothing as its parent if done when HEAD is not valid
yet.
next prev parent reply other threads:[~2012-12-23 19:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-21 19:10 [PATCH 1/2] tests: move test_cmp_rev to test-lib-functions Martin von Zweigbergk
2012-12-21 19:10 ` [PATCH 2/2] learn to pick/revert into unborn branch Martin von Zweigbergk
2012-12-23 3:24 ` Junio C Hamano
2012-12-23 6:24 ` Martin von Zweigbergk
2012-12-23 7:01 ` Christian Couder
2012-12-23 19:20 ` Junio C Hamano
2012-12-23 20:27 ` Philip Oakley
2012-12-23 19:18 ` Junio C Hamano
2012-12-23 19:35 ` Junio C Hamano [this message]
2012-12-24 7:20 ` Martin von Zweigbergk
2012-12-23 4:02 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vvcbso93f.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=martinvonz@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.
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 NNTP newsgroup(s).