* nice to have, just sharing - cannot pull with rebase: You have unstaged changes
@ 2021-09-19 20:26 Jason Pyeron
2021-09-20 16:28 ` Carlo Arenas
0 siblings, 1 reply; 2+ messages in thread
From: Jason Pyeron @ 2021-09-19 20:26 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: nice to have, just sharing - cannot pull with rebase: You have unstaged changes
2021-09-19 20:26 nice to have, just sharing - cannot pull with rebase: You have unstaged changes Jason Pyeron
@ 2021-09-20 16:28 ` Carlo Arenas
0 siblings, 0 replies; 2+ messages in thread
From: Carlo Arenas @ 2021-09-20 16:28 UTC (permalink / raw)
To: Jason Pyeron; +Cc: git
$ git config --global rebase.autostash
will probably help you already without extra code IMHO
Carlo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-20 16:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-19 20:26 nice to have, just sharing - cannot pull with rebase: You have unstaged changes Jason Pyeron
2021-09-20 16:28 ` Carlo Arenas
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).