All of lore.kernel.org
 help / color / mirror / Atom feed
From: "W. Trevor King" <wking@drexel.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jakub Narebski <jnareb@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v7 3/3] gitweb: add If-Modified-Since handling to git_snapshot().
Date: Wed, 28 Mar 2012 15:27:51 -0400	[thread overview]
Message-ID: <20120328192750.GA6909@odin.tremily.us> (raw)
In-Reply-To: <7vr4wcv8v4.fsf@alter.siamese.dyndns.org>

[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]

On Wed, Mar 28, 2012 at 12:11:27PM -0700, Junio C Hamano wrote:
> "W. Trevor King" <wking@drexel.edu> writes:
> 
> > Grr.  Thanks.  I'm getting lots of rebase practice on this patch set,
> > but I'm still missing things…
> 
> How do you "rebase"?
> 
> It often is the easiest to check out the tip of the previous iteration,
> fix all issues that were brought up in the working tree, eyeball the
> output from "git diff HEAD" to make sure you addressed all the comments,o
> and then make separate commits, using "add -p" to sift the fix-ups
> according to which commit in the previous round they need to update.
> 
> And then finally you run "rebase -i" to squash these fix-ups in.

Ah, that makes a lot of sense.  I had been running `rebase -i`,
editing the earlier commits, and using `commit -a --amend` to squash
them on.  The problem with that approach is that you need to check the
changes vs the previous release before each amend, while with your
suggestion there's a single diff to look through.

Hopefully patches v8+ will be cleaner ;).

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

  reply	other threads:[~2012-03-28 19:28 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20120328164513.GA4389@odin.tremily.us>
2012-03-28 17:44 ` [PATCH v7 0/3] gitweb: refactor If-Modified-Since handling W. Trevor King
2012-03-28 17:44   ` [PATCH v7 1/3] gitweb: add `status` headers to git_feed() responses W. Trevor King
2012-03-28 17:44   ` [PATCH v7 2/3] gitweb: refactor If-Modified-Since handling W. Trevor King
2012-03-28 17:44   ` [PATCH v7 3/3] gitweb: add If-Modified-Since handling to git_snapshot() W. Trevor King
2012-03-28 18:11     ` Jakub Narebski
2012-03-28 18:37       ` W. Trevor King
2012-03-28 19:11         ` Junio C Hamano
2012-03-28 19:27           ` W. Trevor King [this message]
2012-03-28 21:45             ` Jakub Narebski
2012-03-28 21:28         ` Jakub Narebski
2012-03-29 12:45           ` [PATCH v8 0/3] gitweb: refactor If-Modified-Since handling W. Trevor King
2012-03-29 12:45             ` [PATCH v8 1/3] gitweb: add `status` headers to git_feed() responses W. Trevor King
2012-03-30 15:21               ` Jakub Narebski
2012-03-29 12:45             ` [PATCH v8 2/3] gitweb: refactor If-Modified-Since handling W. Trevor King
2012-03-30 15:30               ` Jakub Narebski
2012-03-29 12:45             ` [PATCH v8 3/3] gitweb: add If-Modified-Since handling to git_snapshot() W. Trevor King
2012-03-30 16:07               ` Jakub Narebski
2012-03-30 16:11             ` [PATCH v8 0/3] gitweb: refactor If-Modified-Since handling 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=20120328192750.GA6909@odin.tremily.us \
    --to=wking@drexel.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@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 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.