git4idea: rewritten git pull, refactored common functionality from merge dialog ...
commit0ade293125319e7741cc7b876c42cbf9af027b25
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Tue, 28 Oct 2008 12:07:44 +0000 (28 15:07 +0300)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Tue, 28 Oct 2008 12:07:44 +0000 (28 15:07 +0300)
tree20f196a85eae1752423517238a114f25a4886eaf
parent27cedf15528fd2d7652f2116a4713642743f414f
git4idea: rewritten git pull, refactored common functionality from merge dialog (fixed IDEADEV-31502, a partial fix to IDEADEV-31460, IDEADEV-31464)
13 files changed:
plugins/git4idea/src/git4idea/GitRemote.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/GitVcs.java
plugins/git4idea/src/git4idea/actions/GitPull.java
plugins/git4idea/src/git4idea/commands/GitHandler.java
plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java
plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java
plugins/git4idea/src/git4idea/config/GitConfigUtil.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/i18n/GitBundle.properties
plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
plugins/git4idea/src/git4idea/merge/GitMergeUtil.java
plugins/git4idea/src/git4idea/merge/GitPullDialog.form [new file with mode: 0644]
plugins/git4idea/src/git4idea/merge/GitPullDialog.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/ui/GitUIUtil.java