From: "Jason Pyeron" <jpyeron@pdinc.us>
To: <git@vger.kernel.org>
Subject: nice to have, just sharing - cannot pull with rebase: You have unstaged changes
Date: Sun, 19 Sep 2021 16:26:25 -0400 [thread overview]
Message-ID: <375601d7ad94$9eccb5a0$dc6620e0$@pdinc.us> (raw)
It would be nice if it did the fetch to discover the Current branch master is up to date before failing with You have unstaged changes.
If someone does it, send me a bill for a nice dinner - bounty offered. I wish I had more time.
$ git pull -r
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
$ git stash
Saved working directory and index state WIP on master: 2134bc6 corrected acronym: ACCIDENT: Assessment, Compliance, Correlation, and Incident response for the DoD ENTerprise
$ git pull -r
Current branch master is up to date.
$ git stash pop
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
--
Jason Pyeron | Architect
PD Inc | Certified SBA 8(a)
10 w 24th St | Certified SBA HUBZone
Baltimore, MD | CAGE Code: 1WVR6
.mil: jason.j.pyeron.ctr@mail.mil
.com: jpyeron@pdinc.us
tel : 202-741-9397
next reply other threads:[~2021-09-19 20:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-19 20:26 Jason Pyeron [this message]
2021-09-20 16:28 ` nice to have, just sharing - cannot pull with rebase: You have unstaged changes Carlo Arenas
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='375601d7ad94$9eccb5a0$dc6620e0$@pdinc.us' \
--to=jpyeron@pdinc.us \
--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).