replaced <code></code> with more concise {@code}
[idea/community.git] / plugins / git4idea / src / git4idea / update / GitMergeUpdater.java
2017-07-13 Alexey Kudravtsevreplaced <code></code> with more concise {@code}
2017-04-28 Anna.Kozlovaanonymous -> lambda
2017-03-25 Kirill LikhodedovSimplify: don't pass the map, when just one element...
2017-01-23 Aleksey Pivovarovgit: extract method Git.getInstance
2016-08-08 Anna.Kozlovaexplicit types to diamonds
2016-07-22 Anna.Kozlovaexplicit types to diamonds
2016-05-02 Kirill Likhodedovgit: get rid of GitPlatformFacade as not valuable anymore
2015-09-24 Kirill Likhodedov[git] Simplify: use "API" instead of direct GitHandler...
2015-09-18 Kirill Likhodedov[git] rename class to a more generic name to contain...
2015-05-15 Kirill Likhodedov[vcs] Don't call FilePathImpl constructor directly...
2014-07-23 Kirill Likhodedov[git] Don't convert paths to uppercase: compare them...
2014-06-30 Kirill Likhodedov[git] IDEA-90058 Fix empty Untracked files would be...
2014-06-24 Kirill Likhodedov[git] Init dialog in EDT + UIUtil.invokeAndWait(Computable)
2014-03-06 Nadya Zabrodinavcs notification structure refactored and common integr... phpstorm/134.1460
2013-03-09 Kirill Likhodedov[git] Change GitHandler#setNoSSH() to setRemoteProtocol()
2013-01-22 Kirill Likhodedov[git] Better progress indicator during Update
2012-12-14 Kirill Likhodedov[git] IDEA-94263 Additional protection against skipping...
2012-11-15 Kirill Likhodedov[git] Reverting unfinished changes for push.
2012-11-11 Kirill Likhodedov[git] Merge GitPushSpec into GitBranchPair, because...
2012-10-19 Kirill Likhodedov[dvcs] move more stuff from Git, make DvcsPlatformFacad...
2012-10-11 Kirill Likhodedov[git] Support the older format of the "Untracked files...
2012-10-10 Kirill LikhodedovGit branches refactoring, tests and some minor fixes.
2012-06-06 Kirill LikhodedovIDEA-87116 Cancel push if merge conflicts occur during...
2012-05-12 Kirill LikhodedovAdd toString to GitMerge/RebaseUpdater for nicer logging.
2012-05-12 Kirill Likhodedov[git] don't log diff & rev-list to the console on update
2012-04-11 Kirill Likhodedovcompile fix: use correct number of arguments for Untrac...
2012-04-11 Kirill LikhodedovUntrackedFilesNotifier: use PlatformFacade to get notif...
2012-04-04 Kirill LikhodedovGitConflictResolver: decrease dependencies
2012-04-04 Kirill LikhodedovGitConflictResolver: decrease dependencies
2012-03-02 Kirill LikhodedovGitMergeUpdater: better logging
2012-02-02 Kirill LikhodedovGitMergeUpdater: remove incorrect parameter from 'git...
2012-01-23 Kirill LikhodedovMove GitUtil back to git4idea, because the TeamCity...
2012-01-17 Kirill LikhodedovMove GitUtil, GitFileUtils, StringScanner, GitUIUtil...
2012-01-17 Kirill LikhodedovMove branch related stuff to git4idea.branch; move...
2012-01-13 Kirill LikhodedovGitUpdater#getRemotelyChangedPaths -> GitUtil.getPathsD...
2011-11-07 Kirill LikhodedovGit push: in the branch row show where it is going...
2011-10-25 Kirill LikhodedovGit. Detect "untracked files would be overwritten by...
2011-09-17 Kirill LikhodedovRename GitMergeConflictResolver -> GitConflictResolver
2011-09-17 Kirill LikhodedovGitMergeConflictResolver refactoring
2011-06-30 irengrigGit: freezing local changes update for the time of...
2011-04-04 Kirill LikhodedovGitTask: ability to run without creating a Task; use...
2011-04-04 Kirill LikhodedovGit update cancel: no-ssh-exception.
2011-04-04 Kirill LikhodedovGitUpdater: use diff instead of log to compare .origin...
2011-03-23 Kirill Likhodedovgit pull: stash is needed if there is anything in the...
2011-03-19 Kirill LikhodedovGitMergeUpdater: fix swapped local/server versions...
2011-03-18 Kirill LikhodedovGit update: extract fetch; don't try to update if not...
2011-03-10 Kirill Likhodedovgit update: logs, javadocs
2011-03-10 Kirill Likhodedovgit: "the following files would be overwritten by merge"
2011-03-10 Kirill Likhodedovgit: don't stash/shelve before update if possible.
2011-03-10 Kirill LikhodedovAdd title to MultipleFileMergeDialog
2011-03-10 Kirill Likhodedovgit: cancel merge via git reset --merge
2011-03-10 Kirill LikhodedovGit update: don't continue rebase/merge in AWT
2011-03-10 Kirill LikhodedovGit update: DRY conflict merge procedure
2011-03-10 Kirill LikhodedovGit update: check if merge is in progress
2011-03-10 Kirill LikhodedovGit update totally rewritten