git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: skimo@liacs.nl
Cc: git@vger.kernel.org
Subject: Re: Volume of commits
Date: Sat, 21 Jul 2007 18:12:03 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0707211811280.14781@racer.site> (raw)
In-Reply-To: <20070713103025.GR1528MdfPADPa@greensroom.kotnet.org>

Hi,

On Fri, 13 Jul 2007, Sven Verdoolaege wrote:

> [...] if I do the following:
> 
> bash-3.00$ git init
> Initialized empty Git repository in .git/
> bash-3.00$ for i in a b c; do touch $i; git add $i; git commit -m $i -a; done
> Created initial commit 19a8485: a
>  0 files changed, 0 insertions(+), 0 deletions(-)
>  create mode 100644 a
> Created commit 4a00f85: b
>  0 files changed, 0 insertions(+), 0 deletions(-)
>  create mode 100644 b
> Created commit defe3b5: c
>  0 files changed, 0 insertions(+), 0 deletions(-)
>  create mode 100644 c
> bash-3.00$ git rebase -i  HEAD~2
> 
> and then replace the second "pick" by "squash", then I get presented
> a commit message that contains the commit message of "c" twice and
> after the rebase there are still three commits in the history.
> This is with git version 1.5.3.rc1.10.gae1ae
> (on top of v1.5.3-rc1-4-gaf83bed).

It no longer reproduces, which probably means that I inadvertently fixed 
the bug ;-)

Ciao,
Dscho

  parent reply	other threads:[~2007-07-21 17:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-12 13:16 Volume of commits Fredrik Tolf
2007-07-12 13:29 ` VMiklos
2007-07-12 13:59   ` Johannes Schindelin
2007-07-13 10:30     ` Sven Verdoolaege
2007-07-13 12:46       ` Alex Riesen
2007-07-21 17:09       ` [PATCH] rebase -i: call editor just once for a multi-squash Johannes Schindelin
2007-07-21 17:12       ` Johannes Schindelin [this message]
2007-07-12 13:49 ` Volume of commits Karl Hasselström
2007-07-12 14:03 ` Karl Hasselström
2007-07-12 14:51   ` Fredrik Tolf
2007-07-12 16:09     ` Joshua N Pritikin
2007-07-12 16:21     ` Karl Hasselström
2007-07-12 16:46 ` Linus Torvalds
2007-07-13  0:40 ` Jakub Narebski

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=Pine.LNX.4.64.0707211811280.14781@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=skimo@liacs.nl \
    /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).