From: Bulat Musin <mbulatka@yandex.ru>
To: git@vger.kernel.org
Subject: [bug report]: error doing_rebase
Date: Mon, 5 Feb 2018 22:26:57 +0300 [thread overview]
Message-ID: <d4246fa9-5ca2-33c9-d7b6-07adfd9b55a6@yandex.ru> (raw)
Hi.
To reproduce:
git init testrepo
cd testrepo
echo 1 >> file
git add file
git commit -m'1'
echo 2 >> file
git add file
git commit -m'2'
echo 3 >> file
git add file
git commit -m'3'
Now there are 3 sequential commits, I want to squash them into 1:
git rebase -i HEAD~2
In editor I changed all "pick" to "squash", saved file, I got:
error: cannot 'squash' without a previous commit
You can fix this with 'git rebase --edit-todo' and then run 'git rebase
--continue'.
Or you can abort the rebase with 'git rebase --abort'.
However, 2.14.1 from Ubuntu's repo does the job - squashes 3 commits into 1.
Thanks.
git version 2.16.1.72.g5be1f00a9
next reply other threads:[~2018-02-05 19:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-05 19:26 Bulat Musin [this message]
2018-02-06 9:47 ` [bug report]: error doing_rebase Johannes Schindelin
[not found] ` <0254c12c-e820-9c00-a4d0-2192fca76130@yandex.ru>
2018-02-07 14:12 ` Johannes Schindelin
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=d4246fa9-5ca2-33c9-d7b6-07adfd9b55a6@yandex.ru \
--to=mbulatka@yandex.ru \
--cc=git@vger.kernel.org \
/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).