From: Thomas Rast <trast@student.ethz.ch>
To: Jeff King <peff@peff.net>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Shawn Pearce <spearce@spearce.org>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Jens Lehmann <Jens.Lehmann@web.de>,
Christian Couder <chriscool@tuxfamily.org>,
git <git@vger.kernel.org>
Subject: Re: Summer of Code project ideas due this Friday
Date: Fri, 11 Mar 2011 14:31:03 +0100 [thread overview]
Message-ID: <201103111431.04066.trast@student.ethz.ch> (raw)
In-Reply-To: <20110310184653.GA17832@sigill.intra.peff.net>
Jeff King wrote:
> On Thu, Mar 10, 2011 at 06:15:23PM +0100, Thomas Rast wrote:
>
> > * Clean up add -p
>
> One more wishlist item for this. I use "add -p" for almost all of my
> adds these days, because I like the final review check. So after a
> conflicted merge, I find myself doing "add -p" to stage my resolution.
> The current behavior is that it shows the --cc diff and exits. It would
> be cool to handle staging the resolution, which would involve converting
> the combined diff into something that can be applied.
Good idea, thanks.
I put this (with your idea) and the word-merge thing on the wiki.
I'll let Jonathan decide what to do about the fast-import stream
filtering.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2011-03-11 13:31 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-03 18:08 Google Summer of Code 2011 Shawn Pearce
2011-03-03 18:59 ` Jeff King
2011-03-03 19:04 ` Shawn Pearce
2011-03-03 20:33 ` Jeff King
2011-03-03 21:25 ` Jakub Narebski
2011-03-09 16:38 ` Jeff King
2011-03-09 16:39 ` Jeff King
2011-03-09 16:47 ` Shawn Pearce
2011-03-09 17:49 ` Jeff King
2011-03-09 17:52 ` Shawn Pearce
2011-03-09 21:58 ` Summer of Code project ideas due this Friday Jeff King
2011-03-10 0:10 ` Jonathan Nieder
2011-03-10 16:30 ` Jeff King
2011-03-10 17:31 ` Shawn Pearce
2011-03-10 21:43 ` Alexander Miseler
2011-03-10 17:15 ` Thomas Rast
2011-03-10 18:17 ` Santi Béjar
2011-03-10 18:46 ` Jeff King
2011-03-10 19:21 ` Junio C Hamano
2011-03-10 19:28 ` Jeff King
2011-03-10 20:54 ` Junio C Hamano
2011-03-10 21:42 ` Jeff King
2011-03-10 22:58 ` Junio C Hamano
2011-03-10 23:09 ` Jeff King
2011-03-11 13:31 ` Thomas Rast [this message]
2011-03-10 17:39 ` Jakub Narebski
2011-03-11 13:28 ` Thomas Rast
2011-03-12 0:20 ` History surgery with fast-import (Re: Summer of Code project ideas due this Friday) Jonathan Nieder
2011-03-13 17:08 ` Summer of Code project ideas due this Friday Ramkumar Ramachandra
2011-03-10 0:19 ` Nguyen Thai Ngoc Duy
2011-03-10 16:31 ` Jeff King
2011-03-10 21:40 ` Alexander Miseler
2011-03-10 22:18 ` Jeff King
2011-03-11 14:17 ` Alexander Miseler
2011-03-12 19:47 ` Alexander Miseler
2011-03-11 12:18 ` Alexander Miseler
2011-03-11 12:52 ` Ilari Liusvaara
2011-03-11 13:48 ` Nguyen Thai Ngoc Duy
2011-03-11 14:10 ` Alexander Miseler
2011-03-11 14:27 ` Nguyen Thai Ngoc Duy
2011-03-11 22:42 ` Sam Vilain
2011-03-12 21:41 ` Alexander Miseler
2011-03-11 12:43 ` Ævar Arnfjörð Bjarmason
2011-03-11 14:24 ` code.sculptor
2011-03-17 23:40 ` Summer of Code project ideas Jakub Narebski
2011-03-22 20:31 ` Heiko Voigt
2011-03-22 22:55 ` J.H.
2011-03-25 1:11 ` Pat Thoyts
2011-03-25 13:02 ` Jakub Narebski
2011-03-03 21:04 ` Google Summer of Code 2011 Ramkumar Ramachandra
2011-03-03 22:08 ` Jonathan Nieder
2011-03-07 12:15 ` Sverre Rabbelier
2011-03-08 12:33 ` Ramkumar Ramachandra
2011-03-08 12:49 ` Sverre Rabbelier
2011-03-03 22:38 ` Jens Lehmann
2011-03-05 4:05 ` Christian Couder
2011-03-06 19:24 ` Sam Vilain
2011-03-07 19:40 ` Heiko Voigt
2011-03-07 20:50 ` Fredrik Gustafsson
2011-03-09 21:52 ` Heiko Voigt
2011-03-09 23:16 ` Fredrik Gustafsson
2011-03-10 22:46 ` Heiko Voigt
2011-03-09 15:18 ` Thomas Rast
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=201103111431.04066.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=Jens.Lehmann@web.de \
--cc=artagnon@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=spearce@spearce.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 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.