All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Jakub Narębski" <jnareb@gmail.com>
Cc: Christian Couder <chriscool@tuxfamily.org>,
	git@vger.kernel.org, Jeff King <peff@peff.net>,
	Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: [PATCH v1 3/3] Documentation: replace: add --graft option
Date: Fri, 23 May 2014 11:26:43 -0700	[thread overview]
Message-ID: <xmqqioowjqqk.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <537F8021.8080304@gmail.com> ("Jakub Narębski"'s message of "Fri, 23 May 2014 19:06:41 +0200")

Jakub Narębski <jnareb@gmail.com> writes:

> W dniu 2014-05-22 23:33, Christian Couder pisze:
>
>> +--graft <commit> [<parent>...]::
>> +	Create a graft commit. A new commit is created with the same
>> +	content as <commit> except that its parents will be
>> +	[<parent>...] instead of <commit>'s parents. A replacement ref
>> +	is then created to replace <commit> with the newly created
>> +	commit.
>> +
>>   -l <pattern>::
>>   --list <pattern>::
>>   	List replace refs for objects that match the given pattern (or
>
> Here I think you can add the graft replacing example:
>
>   cat .git/info/grafts | while read line
>   do git replace --graft $line; done

Do not cat a single file into a pipeline.

    while read definition
    do
    	git replace --graft $definition
    done <"${GIT_DIR:-.git}/info/grafts"

or something.  You might also have to be careful to use "read -r"
and/or avoid feeding a comment line (if info/grafts supports it) to
the command inside do ... done, but I didn't check what the graft
reading code does myself ;-)

  reply	other threads:[~2014-05-23 18:26 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-22 21:33 [PATCH v1 0/3] Add --graft option to git replace Christian Couder
2014-05-22 21:33 ` [PATCH v1 1/3] replace: add --graft option Christian Couder
2014-05-23 19:27   ` Junio C Hamano
2014-05-23 19:51   ` Jeff King
2014-05-23 20:05     ` Junio C Hamano
2014-05-23 20:28       ` Jeff King
2014-05-23 21:22         ` Junio C Hamano
2014-05-23 22:59           ` Eric Sunshine
2014-06-01 16:06     ` Christian Couder
2014-05-22 21:33 ` [PATCH v1 2/3] replace: add test for --graft Christian Couder
2014-05-22 21:33 ` [PATCH v1 3/3] Documentation: replace: add --graft option Christian Couder
2014-05-23 17:06   ` Jakub Narębski
2014-05-23 18:26     ` Junio C Hamano [this message]
2014-05-23 16:59 ` [PATCH v1 0/3] Add --graft option to git replace Junio C Hamano
2014-05-27 19:05   ` Christian Couder

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=xmqqioowjqqk.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    --cc=mhagger@alum.mit.edu \
    --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.
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.