From: Teemu Likonen <tlikonen@iki•fi>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Junio C Hamano <gitster@pobox•com>,
Nicolas Sebrecht <nicolas.s.dev@gmx•fr>,
Nanako Shiraishi <nanako3@lavabit•com>,
John Tapsell <johnflux@gmail•com>,
git@vger•kernel.org
Subject: Re: [PATCH] Re: rebase -i: auto-squash commits
Date: Thu, 18 Jun 2009 11:44:11 +0300 [thread overview]
Message-ID: <87r5xihqxw.fsf@iki.fi> (raw)
In-Reply-To: <alpine.DEB.1.00.0906181028140.4848@intel-tinevez-2-302> (Johannes Schindelin's message of "Thu, 18 Jun 2009 10:29:58 +0200 (CEST)")
On 2009-06-18 10:29 (+0200), Johannes Schindelin wrote:
> So let's just interpret the "!" in the most common meaning, namely to
> add an imperative. Then it means "yes, I do want to squash". Not
> "squash, but oh, BTW, I want to lose the second commit message
> completely, and I do not want to edit the commit message either".
My main point is the "small modifier character" for squash. Perhaps
"squash*" is better? I'll repeat that it is still doing very much the
same thing as "squash" expect for one little thing. Hence it would be
nice to use only small modifier character, not totally new word with
possibly different connotations.
pick aaaa ...
squash* bbbb Small fix to be squashed
pick cccc ...
pick dddd ...
next prev parent reply other threads:[~2009-06-18 8:44 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-17 12:06 git rebase --interactive squash/squish/fold/rollup Minty
2009-06-17 12:55 ` John Tapsell
2009-06-17 13:45 ` Minty
2009-06-17 16:33 ` Junio C Hamano
2009-06-17 16:40 ` John Tapsell
2009-06-17 16:48 ` Paolo Bonzini
2009-06-17 17:05 ` John Koleszar
2009-06-17 20:50 ` John Tapsell
2009-06-17 18:20 ` Clemens Buchacher
2009-06-18 22:31 ` Minty
2009-06-17 21:33 ` [PATCH] rebase -i: auto-squash commits Nanako Shiraishi
2009-06-17 22:08 ` Johannes Schindelin
2009-06-18 0:11 ` [PATCH] " Nicolas Sebrecht
2009-06-18 5:07 ` Junio C Hamano
2009-06-18 8:06 ` Johannes Schindelin
2009-06-18 8:11 ` Jakub Narebski
2009-06-18 8:21 ` Junio C Hamano
2009-06-18 8:26 ` Johannes Schindelin
2009-06-18 8:17 ` Teemu Likonen
2009-06-18 8:29 ` Johannes Schindelin
2009-06-18 8:44 ` Teemu Likonen [this message]
2009-06-18 12:16 ` Johannes Schindelin
2009-06-18 13:10 ` Jakub Narebski
2009-06-18 14:04 ` John Koleszar
2009-06-18 8:20 ` Junio C Hamano
2009-06-18 8:33 ` Johannes Schindelin
2009-06-18 8:44 ` Michael J Gruber
2009-06-19 7:18 ` Miles Bader
2009-06-18 11:18 ` Nicolas Sebrecht
2009-06-18 8:34 ` Matthieu Moy
2009-06-18 8:44 ` Johannes Schindelin
2009-06-18 8:59 ` Matthieu Moy
2009-06-18 10:59 ` Nicolas Sebrecht
2009-06-18 5:21 ` [PATCH] " Junio C Hamano
2009-06-18 21:55 ` [PATCH v2] rebase -i --autosquash: " Nanako Shiraishi
2009-06-18 22:35 ` Alex Riesen
2009-06-19 23:07 ` Wincent Colaiuta
2009-06-20 1:46 ` Nanako Shiraishi
2009-06-18 7:20 ` [PATCH] rebase -i: " Michael Haggerty
2009-06-18 7:54 ` 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=87r5xihqxw.fsf@iki.fi \
--to=tlikonen@iki$(echo .)fi \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johnflux@gmail$(echo .)com \
--cc=nanako3@lavabit$(echo .)com \
--cc=nicolas.s.dev@gmx$(echo .)fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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