Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> On Wed, 4 Jul 2007, Johannes Sixt wrote:
>
>> - The map function used to fail, but no longer does (since 3520e1e8687.)
>> - Fix the "edge-graft" example.
>> - Show the same using .git/info/grafts.
>>
>> Signed-off-by: Johannes Sixt <johannes.sixt@xxxxxxxxxx>
>> ---
>>
>> I think that "edge-graft" makes more sense than "etch-graft".
>> Native speakers, please?
>
> I looked at dict.leo.org, and it does not know either version. Maybe it is
> just "graft"?
Why even need a new term there, if you are not going to use it
elsewhere? Instead of saying:
-To "etch-graft" a commit to the revision history (set a commit to be
+To "edge-graft" a commit to the revision history (set a commit to be
the parent of the current initial commit and propagate that):
----------------------------------------------------------------------
git filter-branch --parent-filter sed\ 's/^$/-p <graft-id>/' newbranch
----------------------------------------------------------------------
You could say:
To set a commit to be the parent of the current initial
commit and propagate that:
without inventing unfamiliar word that is not used anywhere else
in the documentation.
One thing that you may want to stress is that <graft-id> does
not represent a single commit, but the history that leads to it.
So "set a commit to be a parent" is technically correct, but it
is not "To edge-graft _a_ commit", but more like "Paste another
history behind the current beginning of time".
You have two filmstrips, the first frame of one filmstrip, your
current history, should logically follow the last frame of the
other filmstrip but they are separated into two. You are
splicing them together to make a single, longer, filmstrip.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
