% ./Tools/Scripts/git-webkit up Downloading whichcraft-0.6.1... Installing whichcraft-0.6.1... Installed whichcraft-0.6.1! error: cannot pull with rebase: You have unstaged changes. error: additionally, your index contains uncommitted changes. error: please commit or stash them. % ./Tools/Scripts/git-webkit pull error: cannot pull with rebase: You have unstaged changes. error: additionally, your index contains uncommitted changes. error: please commit or stash them. This doesn't work. I need the ability to rebase against remote main without having to commit or stash local changes.
The implementation that first came to my mind would be controversial because it wouldn't work well from a branch, but turns out that `git pull` has an `--autostash` option, which should do what you're asking.
(In reply to Jonathan Bedard from comment #1) > The implementation that first came to my mind would be controversial because > it wouldn't work well from a branch, but turns out that `git pull` has an > `--autostash` option, which should do what you're asking. oh, that's neat. so that'll stash, pull, then stash apply?
(In reply to Ryosuke Niwa from comment #2) > (In reply to Jonathan Bedard from comment #1) > > The implementation that first came to my mind would be controversial because > > it wouldn't work well from a branch, but turns out that `git pull` has an > > `--autostash` option, which should do what you're asking. > > oh, that's neat. so that'll stash, pull, then stash apply? Looks like it creates a temporary stash commit to be compatible with --rebase, but basically yes.
<rdar://problem/88298948>
Pull request: https://github.com/WebKit/WebKit/pull/113
Landed 246972@main (r289386)