git4idea: Implemeted forced merge/rebase and stash options for update operation
commitaae7863535696feb75ad7b4ccda85ae367f169df
authorConstantine Plotnikov <constantine.plotnikov@gmail.com>
Tue, 29 Sep 2009 15:59:27 +0000 (29 19:59 +0400)
committerConstantine Plotnikov <constantine.plotnikov@gmail.com>
Wed, 30 Sep 2009 17:29:25 +0000 (30 21:29 +0400)
tree6cd0819957b39bac3e3934e36f8c56f60cc8bb6b
parent1d502ca8dc9491c4b0f792482aeadfff42c0abf7
git4idea: Implemeted forced merge/rebase and stash options for update operation
plugins/git4idea/src/git4idea/GitUtil.java
plugins/git4idea/src/git4idea/GitVcs.java
plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java
plugins/git4idea/src/git4idea/changes/GitChangeUtils.java
plugins/git4idea/src/git4idea/config/GitVcsSettings.java
plugins/git4idea/src/git4idea/i18n/GitBundle.properties
plugins/git4idea/src/git4idea/update/GitStashUtils.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form [new file with mode: 0644]
plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java [new file with mode: 0644]