This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 246075

Summary:	Please add feature to stash uncommited changes while pulling and
Product:	versioncontrol	Reporter:	Christian Lenz <chrizzly>
Component:	Git	Assignee:	Ondrej Vrabec <ovrabec>
Status:	CLOSED WORKSFORME
Severity:	normal	CC:	git
Priority:	P3
Version:	8.0.1
Hardware:	PC
OS:	Windows 7
Issue Type:	ENHANCEMENT	Exception Reporter:

Description Christian Lenz 2014-07-28 21:25:30 UTC

Sometimes, its a pain in the ass if you have uncommited changes and you have to pull because of change, then you have some options:

Commit changes, pull again.
Revert Mod., pull again
Stash, pull again, Stash apply (Or for now patch/diff)

This is the scenario:

Uncommited files, maybe of some changes which are not for commit and not for ignore because the file is important. When I pull and select rebase, I got the message to revert changes or review them.

The feature pull or fetch -> stash -> merge/rebase -> stash apply would be very nice. I think this functionality is already implemented in intelliJ :).


Regards

Chris

Comment 1 Ondrej Vrabec 2014-07-29 07:11:45 UTC

when pulling with rebase this is already done automatically if you set it in gitconfig: rebase.autostash = true

Comment 2 Christian Lenz 2014-07-29 12:19:41 UTC

I added it via "git config rebase.autostash true" and it's inside my config, but when I do "Pull from upstream..." I got the dialog "You have local modifications.... revert, review, cancel". So It's like before, but it don't ask me anymore what I want to do, merge or rebase.

Comment 3 Christian Lenz 2014-09-24 11:43:33 UTC

I will close this, because as Ondrej said, it should be already there. I don't got the message with the modifications.

Thx and regards.