From: Stephen Leake <stephen_leake@stephe-leake.org>
To: emacs-devel <emacs-devel@gnu.org>
Subject: pushing rewritten scratch branch
Date: Thu, 25 Apr 2019 15:42:46 -0800 [thread overview]
Message-ID: <864l6l8xe1.fsf@stephe-leake.org> (raw)
I have a scratch branch scratch/project-uniquify-files, that I'm having
trouble pushing.
I wanted to squash the commits so it would be easier to review, but I
had done 'merge' from master instead of 'rebase'.
So I extracted a diff from master, reverted the branch to master with
'git reset --hard master', applied the diff, and committed.
Now I'm trying to do 'git push', but it's rejected because it's not a
"fast-forward" commit.
Following 'git push --help', I tried to override that with:
git push origin +scratch/project-uniquify-files:scratch/project-uniquify-files
But that gave the same error.
How do I fix this?
I think I can delete the remote branch and recreate it, but it seems
like there ought to be an easier way.
--
-- Stephe
next reply other threads:[~2019-04-25 23:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 23:42 Stephen Leake [this message]
2019-04-26 0:04 ` pushing rewritten scratch branch Dmitry Gutov
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=864l6l8xe1.fsf@stephe-leake.org \
--to=stephen_leake@stephe-leake.org \
--cc=emacs-devel@gnu.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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.