From: Szunti <szunti@gmail.com>
To: git@vger.kernel.org
Subject: rebase with unknown -s parameter discards commits
Date: Sat, 15 Aug 2015 02:01:18 +0200 [thread overview]
Message-ID: <55CE814E.1050603@gmail.com> (raw)
git version: 2.5.0
Archlinux
Hi,
'git rebase -s nonsense master' gives an error message but still changes
the branch.
$git rebase -s nonsense master topic
First, rewinding head to replay your work on top of it...
/usr/lib/git-core/git-rebase--merge: line 70: git-merge-nonsense:
command not found
Unknown exit code (127) from command: git-merge-nonsense
3cf5c040ccda670cc103184a6d7e03fc20293b81^ -- HEAD
3cf5c040ccda670cc103184a6d7e03fc20293b8
And topic is the same as master now.
If I try to continue
$git rebase --continue
Already applied: 0001 Topic
All done.
But still topic is the same as master.
-----------------------------------------------------
topic and master was created with these commands:
$git init
$echo orig > text
$git add text
$git commit -m Orig
$git checkout -b topic
$echo topic > text
$git commit -am Topic
$git checkout master
$echo master > text
$git commit -am Master
$git rebase -s nonsense master topic
$git rebase --continue
$git log --oneline
04d7f1d Master
0ac994c Orig
reply other threads:[~2015-08-15 0:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=55CE814E.1050603@gmail.com \
--to=szunti@gmail.com \
--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).