From: Steffen Nurpmeso <steffen@sdaoden.eu>
To: git@vger.kernel.org
Cc: Steffen Nurpmeso <steffen@sdaoden.eu>
Subject: 2.25.0: git rebase -i fails to --continue with staged data
Date: Sat, 01 Feb 2020 19:36:19 +0100 [thread overview]
Message-ID: <20200201183619.tUTI7%steffen@sdaoden.eu> (raw)
Hello.
#?1|kent:xxx.git$ git alias|grep rema
alias.rema rebase -i master
...
#?0|kent:xxx.git$ git status
interactive rebase in progress; onto 4a17872e
Last commands done (39 commands done):
e 6c7e85ef FIXME src/mx/gen-cmd-tab.h: regenerated
e 0314b1e7 FIXME src/mx/gen-okeys.h: regenerated
(see more in file .git/rebase-merge/done)
Next commands to do (41 remaining commands):
pick 31fb18fb FIXME NEWS: v14.9.17 ("To bind, or not to bind.."), 2020-02-01
pick 763c0a26 [v15-compat] Make *v15-compat*=yes a default!
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch 'notpushed' on '4a17872e'.
(use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes)
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: src/mx/gen-okeys.h
#?0|kent:xxx.git$ git rebase --continue
error:
You have uncommitted changes in your working tree. Please, commit them
first and then run 'git rebase --continue' again.
#?1|kent:xxx.git$
So i was "e"diting commit
e 0314b1e7 FIXME src/mx/gen-okeys.h: regenerated
but cannot simply --continue here --- before 2.25.0 this would now
open the editor and then commit what i have into a.k.a. as the
commit we are editing. So if i now "commit --amend" i will amend
the commit before the one i want, if i commit anything else
i introduce a new commit.
--steffen
|
|Der Kragenbaer, The moon bear,
|der holt sich munter he cheerfully and one by one
|einen nach dem anderen runter wa.ks himself off
|(By Robert Gernhardt)
next reply other threads:[~2020-02-01 18:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-01 18:36 Steffen Nurpmeso [this message]
2020-02-01 18:59 ` 2.25.0: git rebase -i fails to --continue with staged data Steffen Nurpmeso
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=20200201183619.tUTI7%steffen@sdaoden.eu \
--to=steffen@sdaoden.eu \
--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).