git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sam Vilain <sam@vilain.net>
To: Peter Baumann <Peter.B.Baumann@stud.informatik.uni-erlangen.de>
Cc: git@vger.kernel.org, "Alexey Dobriyan" <adobriyan@gmail.com>
Subject: Re: selective git-update-index per diff(1) chunks
Date: Sun, 03 Dec 2006 10:08:47 +1300	[thread overview]
Message-ID: <4571EB5F.7030300@vilain.net> (raw)
In-Reply-To: <slrnen04os.a5.Peter.B.Baumann@xp.machine.xx>

Peter Baumann wrote:
>> Now I want to commit them as two separate commits. So far, it's
>> * getting full diff
>> * cp(1)
>> * hand-edit both diffs
>> * commit first
>> * commit second

I made a patch to 'cg-commit -p' to do this, check the archives.

>> Relying on diff(1) definition of chunks is sorta hacky, though... I admit it.
> 
> I don't think it belongs in the plumbing, the git-update-index but I
> think something like this would be very usefull.
> 
> AFAIR darcs has this functionality. It selectively ask for each hunk if
> it should be commited. This would be awfull to have in git.

darcs and SVK both have this "interactive commit".

darcs also does something very useful with this; what amounts to
automatically making topic branches.  Currently there is no easy way to
manage that, either.

Sam.

  parent reply	other threads:[~2006-12-02 21:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-01 11:23 selective git-update-index per diff(1) chunks Alexey Dobriyan
2006-12-01 11:33 ` Peter Baumann
2006-12-01 11:38   ` Junio C Hamano
2006-12-01 16:45     ` Anand Kumria
2006-12-01 19:42       ` Johannes Schindelin
2006-12-02 21:08   ` Sam Vilain [this message]
2006-12-01 16:06 ` Linus Torvalds
2006-12-04 17:33 ` Sven Verdoolaege
2006-12-04 18:05   ` Jakub Narebski
     [not found]     ` <20061204202102.GH940MdfPADPa@greensroom.kotnet.org>
2006-12-04 20:46       ` Jakub Narebski
2006-12-04 21:51         ` Sven Verdoolaege
2006-12-04 22:35           ` Jakub Narebski

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=4571EB5F.7030300@vilain.net \
    --to=sam@vilain.net \
    --cc=Peter.B.Baumann@stud.informatik.uni-erlangen.de \
    --cc=adobriyan@gmail.com \
    --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 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).