From: Howard Miller <howard@e-learndesign.co.uk>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Any way to "flatten" a series of changes in git
Date: Thu, 22 Oct 2009 22:24:22 +0100 [thread overview]
Message-ID: <26ae428a0910221424n9f45d9bg379fb6609b4eace0@mail.gmail.com> (raw)
In-Reply-To: <26ae428a0910221411l73aa7cbak5c060925ccdf4cea@mail.gmail.com>
2009/10/22 Howard Miller <howard@e-learndesign.co.uk>:
>> You can use either "git merge --squash" or "git rebase --interactive"
>> (changing 'pick' to 'squash').
>>
>
> Actually thinking some more.... I don't understand something about
> this. I don't actually want to merge or rebase with anything. I just
> want to say "make those commits a series of commits on a branch into
> just one commit with a new message". I seriously suspect I'm missing
> the point somewhere but what has that got to do with merging or
> rebasing?
>
> Thanks again
>
Oh..... more reading of the help. It's this I take it...
" For example, if you want to reorder the last 5 commits, such that
what was HEAD~4 becomes the new HEAD. To achieve that, you
would call git-rebase like this:
$ git rebase -i HEAD~5"
Would it be ungrateful to suggest that the existence of that option
isn't clear from the synopsis at the start of the help? :-) I guess
I can put the SHA1 identifier of the first commit in my branch too?
Anyway, I'll go and try it and see what happens.
next prev parent reply other threads:[~2009-10-22 21:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-22 20:03 Any way to "flatten" a series of changes in git Howard Miller
2009-10-22 20:30 ` Bill Lear
2009-10-22 20:44 ` Bill Lear
2009-10-22 20:51 ` Jacob Helwig
2009-10-22 20:58 ` Howard Miller
2009-10-26 13:42 ` Daniele Segato
2009-10-22 20:59 ` Jakub Narebski
2009-10-22 21:11 ` Howard Miller
2009-10-22 21:24 ` Howard Miller [this message]
2009-10-22 21:57 ` Jakub Narebski
2009-10-23 5:36 ` Howard Miller
2009-10-23 5:40 ` Howard Miller
2009-10-23 5:48 ` Johannes Sixt
2009-10-23 6:16 ` 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=26ae428a0910221424n9f45d9bg379fb6609b4eace0@mail.gmail.com \
--to=howard@e-learndesign.co.uk \
--cc=git@vger.kernel.org \
--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 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).