github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-16 17:45:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-mb-detangle-editor

Browse Source
This commit is contained in:
Max Brunsfeld
2016-07-15 09:39:32 -07:00
parent c0cbb59666 07081407c7
commit 4ad801b216
14 changed files with 132 additions and 1607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/workspace.coffee
View File

@@ -1099,7 +1099,7 @@ class Workspace extends Model
checkoutHead = =>
@project.repositoryForDirectory(new Directory(editor.getDirectoryPath()))
.then (repository) ->
repository?.async.checkoutHeadForEditor(editor)
repository?.checkoutHeadForEditor(editor)
if @config.get('editor.confirmCheckoutHeadRevision')
@applicationDelegate.confirm