From: "Boyd Stephen Smith Jr." <bss@iguanasuicide.net>
To: Brent Goodrick <bgoodr@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Trouble testing out a patch on a branch new scratch git.git repository
Date: Mon, 9 Feb 2009 16:14:26 -0600 [thread overview]
Message-ID: <200902091615.24958.bss@iguanasuicide.net> (raw)
In-Reply-To: <e38bce640902091359j3f306839h9aeb699e18e420ab@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
On Monday 09 February 2009 15:59:40 Brent Goodrick wrote:
> To explain what I mean: Yesterday, I had this configuration on my
> bg/no-progress branch:
>
> A---B---C---D (bg/no-progress)
> /
> ----1-----2----3----4 (master)
>
> B C and D commits are noisy,
> fix-the-white-space-and-conform-to-coding-guidelines type commits. I
> want to collapse A through D into one commit called E on that branch
> so that I can run git format-patch -M on the result and provide a nice
> patch email. I would end up with:
>
> E (bg/no-progress)
> /
> ----1-----2----3----4 (master)
Here's my way to do that:
git rebase -i $(git merge-base master bg/noprogress) bg/no-progress
# Editor opens
# Change "pick" -> "squash" for commits B, C, and D.
# rebase runs
# Maybe resolve conflicts
If you are willing to have:
E (bg/no-progress)
/
--1--2--3--4 (master)
at the end, it's a little bit simpler:
git rebase -i master bg/no-progress
# All the rest the same.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@iguanasuicide.net ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-02-09 22:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-08 20:56 Trouble testing out a patch on a branch new scratch git.git repository Brent Goodrick
2009-02-08 21:46 ` Junio C Hamano
2009-02-09 0:13 ` Brent Goodrick
2009-02-09 1:18 ` Boyd Stephen Smith Jr.
2009-02-09 2:59 ` Brent Goodrick
2009-02-09 4:58 ` Junio C Hamano
2009-02-09 21:59 ` Brent Goodrick
2009-02-09 22:14 ` Boyd Stephen Smith Jr. [this message]
2009-02-10 5:32 ` Sitaram Chamarty
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200902091615.24958.bss@iguanasuicide.net \
--to=bss@iguanasuicide.net \
--cc=bgoodr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).