diff --git a/lib/controllers/git-tab-controller.js b/lib/controllers/git-tab-controller.js
index 1cdde65f9a..ac5710fb69 100644
--- a/lib/controllers/git-tab-controller.js
+++ b/lib/controllers/git-tab-controller.js
@@ -98,7 +98,7 @@ export default class GitTabController {
       lastCommit: repository.getLastCommit(),
       isMerging: repository.isMerging(),
       isRebasing: repository.isRebasing(),
-      branchName: repository.getCurrentBranch(),
+      currentBranch: repository.getCurrentBranch(),
       branches: repository.getBranches(),
       remoteName: repository.getRemoteForBranch(this.branchName),
       unstagedChanges: repository.getUnstagedChanges(),
diff --git a/lib/controllers/github-tab-controller.js b/lib/controllers/github-tab-controller.js
index 08f3d5649d..3ccb66943b 100644
--- a/lib/controllers/github-tab-controller.js
+++ b/lib/controllers/github-tab-controller.js
@@ -6,23 +6,23 @@ import RemotePrController from './remote-pr-controller';
 import Repository from '../models/repository';
 import GithubLoginModel from '../models/github-login-model';
 import ObserveModel from '../decorators/observe-model';
-import {RemotePropType} from '../prop-types';
+import {RemotePropType, BranchPropType} from '../prop-types';
 
 class RemoteSelector extends React.Component {
   static propTypes = {
     remotes: React.PropTypes.arrayOf(RemotePropType).isRequired,
-    currentBranch: React.PropTypes.string.isRequired,
+    currentBranchName: React.PropTypes.string.isRequired,
     selectRemote: React.PropTypes.func.isRequired,
   }
 
   render() {
-    const {remotes, currentBranch, selectRemote} = this.props;
+    const {remotes, currentBranchName, selectRemote} = this.props;
     return (
       <div className="github-RemoteSelector">
         <p>
           This repository has multiple remotes hosted at GitHub.com.
           Select a remote to see pull requests associated
-          with the <strong>{currentBranch}</strong> branch.
+          with the <strong>{currentBranchName}</strong> branch.
         </p>
         <ul>
           {remotes.map(remote => (
@@ -55,13 +55,13 @@ export default class GithubTabController extends React.Component {
   static propTypes = {
     repository: React.PropTypes.object,
     remotes: React.PropTypes.arrayOf(RemotePropType.isRequired),
-    currentBranch: React.PropTypes.string,
+    currentBranch: BranchPropType,
     selectedRemote: React.PropTypes.string,
   }
 
   static defaultProps = {
     remotes: null,
-    currentBranch: '',
+    currentBranch: {name: '', isDetached: false},
     selectedRemote: null,
   }
 
@@ -75,6 +75,10 @@ export default class GithubTabController extends React.Component {
       return null;
     }
 
+    if (!this.currentBranch || this.currentBranch.isDetached) {
+      return null;
+    }
+
     let remote = this.props.remotes.find(r => r.name === this.props.selectedRemote);
     let remotesAvailable = false;
     if (!remote && this.props.remotes.length === 1) {
@@ -93,13 +97,13 @@ export default class GithubTabController extends React.Component {
               endpoint="https://api.github.com"
               loginModel={this.loginModel}
               remote={remote}
-              currentBranch={this.props.currentBranch}
+              currentBranchName={this.props.currentBranch.name}
             />
           }
           {!remote && remotesAvailable &&
             <RemoteSelector
               remotes={this.props.remotes}
-              currentBranch={this.props.currentBranch}
+              currentBranchName={this.props.currentBranch.name}
               selectRemote={this.handleRemoteSelect}
             />
           }
diff --git a/lib/controllers/pr-info-controller.js b/lib/controllers/pr-info-controller.js
index 8d97ee368e..d3305bc9ae 100644
--- a/lib/controllers/pr-info-controller.js
+++ b/lib/controllers/pr-info-controller.js
@@ -53,7 +53,7 @@ export default class PrInfoController extends React.Component {
     endpoint: React.PropTypes.string.isRequired,
     token: React.PropTypes.string.isRequired,
     instance: React.PropTypes.string.isRequired,
-    currentBranch: React.PropTypes.string.isRequired,
+    currentBranchName: React.PropTypes.string.isRequired,
     loginModel: React.PropTypes.object.isRequired,
     onLogin: React.PropTypes.func.isRequired,
     remote: RemotePropType.isRequired,
@@ -65,7 +65,7 @@ export default class PrInfoController extends React.Component {
     const route = new PrInfoRoute({
       repoOwner: this.props.remote.info.owner,
       repoName: this.props.remote.info.name,
-      branchName: this.props.currentBranch,
+      branchName: this.props.currentBranchName,
     });
 
     const environment = getEnvironmentForInstance(instance, endpoint, token);
diff --git a/lib/controllers/remote-pr-controller.js b/lib/controllers/remote-pr-controller.js
index dec723969d..7fdf34755d 100644
--- a/lib/controllers/remote-pr-controller.js
+++ b/lib/controllers/remote-pr-controller.js
@@ -22,7 +22,7 @@ export default class RemotePrController extends React.Component {
     endpoint: React.PropTypes.string, // fully qualified URI to the API endpoint, e.g. 'https://api.github.com'
     remote: RemotePropType.isRequired,
     token: React.PropTypes.string,
-    currentBranch: React.PropTypes.string.isRequired,
+    currentBranchName: React.PropTypes.string.isRequired,
   }
 
   static defaultProps = {
@@ -32,11 +32,11 @@ export default class RemotePrController extends React.Component {
   }
 
   render() {
-    const {instance, endpoint, remote, currentBranch, token, loginModel} = this.props;
+    const {instance, endpoint, remote, currentBranchName, token, loginModel} = this.props;
     return (
       <div className="github-RemotePrController">
         {token && <PrInfoController
-          {...{instance, endpoint, remote, currentBranch, token, loginModel}}
+          {...{instance, endpoint, remote, currentBranchName, token, loginModel}}
           onLogin={this.handleLogin}
                   />
           }
diff --git a/lib/controllers/status-bar-tile-controller.js b/lib/controllers/status-bar-tile-controller.js
index beacb74012..51586775d8 100644
--- a/lib/controllers/status-bar-tile-controller.js
+++ b/lib/controllers/status-bar-tile-controller.js
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import ObserveModel from '../decorators/observe-model';
+import {BranchPropType} from '../prop-types';
 import BranchView from '../views/branch-view';
 import BranchMenuView from '../views/branch-menu-view';
 import PushPullView from '../views/push-pull-view';
@@ -15,7 +16,7 @@ import {autobind} from 'core-decorators';
   getModel: props => props.repository,
   fetchData: repository => {
     return yubikiri({
-      branchName: repository.getCurrentBranch(),
+      currentBranch: repository.getCurrentBranch(),
       branches: repository.getBranches(),
       changedFilesCount: repository.getStatusesForChangedFiles().then(statuses => {
         const {stagedFiles, unstagedFiles, mergeConflictFiles} = statuses;
@@ -33,9 +34,9 @@ import {autobind} from 'core-decorators';
 
         return changedFiles.size;
       }),
-      remoteName: async query => repository.getRemoteForBranch(await query.branchName),
-      aheadCount: async query => repository.getAheadCount(await query.branchName),
-      behindCount: async query => repository.getBehindCount(await query.branchName),
+      remoteName: async query => repository.getRemoteForBranch((await query.currentBranch).name),
+      aheadCount: async query => repository.getAheadCount((await query.currentBranch).name),
+      behindCount: async query => repository.getBehindCount((await query.currentBranch).name),
       pullDisabled: async query => (await query.changedFilesCount) > 0,
     });
   },
@@ -47,7 +48,7 @@ export default class StatusBarTileController extends React.Component {
     commandRegistry: React.PropTypes.object.isRequired,
     tooltips: React.PropTypes.object.isRequired,
     repository: React.PropTypes.object,
-    branchName: React.PropTypes.string,
+    currentBranch: BranchPropType,
     branches: React.PropTypes.arrayOf(React.PropTypes.string),
     remoteName: React.PropTypes.string,
     aheadCount: React.PropTypes.number,
@@ -73,7 +74,7 @@ export default class StatusBarTileController extends React.Component {
 
   render() {
     const repoProps = {
-      branchName: this.props.branchName,
+      currentBranch: this.props.currentBranch || {name: '', isDetached: false},
       branches: this.props.branches,
       remoteName: this.props.remoteName,
       aheadCount: this.props.aheadCount,
@@ -179,7 +180,9 @@ export default class StatusBarTileController extends React.Component {
 
   @autobind
   async push(options) {
-    await this.setInProgressWhile(() => this.props.repository.push(this.props.branchName, options), {push: true});
+    await this.setInProgressWhile(() => {
+      return this.props.repository.push(this.props.currentBranch.name, options);
+    }, {push: true});
   }
 
   @autobind
@@ -188,11 +191,11 @@ export default class StatusBarTileController extends React.Component {
       return;
     }
 
-    await this.setInProgressWhile(() => this.props.repository.pull(this.props.branchName), {pull: true});
+    await this.setInProgressWhile(() => this.props.repository.pull(this.props.currentBranch.name), {pull: true});
   }
 
   @autobind
   async fetch() {
-    await this.setInProgressWhile(() => this.props.repository.fetch(this.props.branchName), {fetch: true});
+    await this.setInProgressWhile(() => this.props.repository.fetch(this.props.currentBranch.name), {fetch: true});
   }
 }
diff --git a/lib/git-shell-out-strategy.js b/lib/git-shell-out-strategy.js
index 7387b22c0d..ba71fbcd64 100644
--- a/lib/git-shell-out-strategy.js
+++ b/lib/git-shell-out-strategy.js
@@ -311,11 +311,21 @@ export default class GitShellOutStrategy {
   async getCommit(ref) {
     const output = await this.exec(['log', '--pretty=%H%x00%B%x00', '--no-abbrev-commit', '-1', ref]);
     const [sha, message] = (output).split('\0');
-    return {sha, message: message.trim()};
+    return {sha, message: message.trim(), unbornRef: false};
   }
 
-  getHeadCommit() {
-    return this.getCommit('HEAD');
+  async getHeadCommit() {
+    try {
+      const commit = await this.getCommit('HEAD');
+      commit.unbornRef = false;
+      return commit;
+    } catch (e) {
+      if (/unknown revision/.test(e.stdErr)) {
+        return {sha: '', message: '', unbornRef: true};
+      } else {
+        throw e;
+      }
+    }
   }
 
   readFileFromIndex(filePath) {
@@ -421,8 +431,20 @@ export default class GitShellOutStrategy {
    * Branches
    */
   async getCurrentBranch() {
-    const output = await this.exec(['rev-parse', '--abbrev-ref', 'HEAD']);
-    return output.trim();
+    const content = await readFile(path.join(this.workingDir, '.git', 'HEAD'));
+    if (content.startsWith('ref: ')) {
+      // The common case: you're on a branch
+      return {
+        name: (await this.exec(['symbolic-ref', '--short', 'HEAD'])).trim(),
+        isDetached: false,
+      };
+    } else {
+      // Detached HEAD
+      return {
+        name: (await this.exec(['describe', '--contains', '--all', 'HEAD'])).trim(),
+        isDetached: true,
+      };
+    }
   }
 
   checkout(branchName, options = {}) {
@@ -454,9 +476,8 @@ export default class GitShellOutStrategy {
   }
 
   async getBranches() {
-    const output = await this.exec(['branch']);
-    return output.trim().split(LINE_ENDING_REGEX)
-      .map(branchName => branchName.trim().replace(/^\* /, ''));
+    const output = await this.exec(['for-each-ref', '--format=%(refname:short)', 'refs/heads/*']);
+    return output.trim().split(LINE_ENDING_REGEX);
   }
 
   async getConfig(option, {local} = {}) {
diff --git a/lib/prop-types.js b/lib/prop-types.js
index f2eb7ea83a..e3471c93ee 100644
--- a/lib/prop-types.js
+++ b/lib/prop-types.js
@@ -19,3 +19,8 @@ export const RemotePropType = PropTypes.shape({
     name: PropTypes.string,
   }).isRequired,
 });
+
+export const BranchPropType = PropTypes.shape({
+  name: PropTypes.string.isRequired,
+  isDetached: PropTypes.bool.isRequired,
+});
diff --git a/lib/views/branch-menu-view.js b/lib/views/branch-menu-view.js
index 84e25df7da..98dece6e37 100644
--- a/lib/views/branch-menu-view.js
+++ b/lib/views/branch-menu-view.js
@@ -3,6 +3,7 @@ import {autobind} from 'core-decorators';
 
 import Commands, {Command} from './commands';
 import {GitError} from '../git-shell-out-strategy';
+import {BranchPropType} from '../prop-types';
 
 export default class BranchMenuView extends React.Component {
   static propTypes = {
@@ -10,12 +11,16 @@ export default class BranchMenuView extends React.Component {
     commandRegistry: React.PropTypes.object.isRequired,
     notificationManager: React.PropTypes.object.isRequired,
     branches: React.PropTypes.arrayOf(React.PropTypes.string),
-    branchName: React.PropTypes.string,
+    currentBranch: BranchPropType,
     checkout: React.PropTypes.func,
   }
 
   static defaultProps = {
     branches: [],
+    currentBranch: {
+      name: '',
+      isDetached: true,
+    },
     checkout: () => Promise.resolve(),
   }
 
@@ -29,7 +34,7 @@ export default class BranchMenuView extends React.Component {
   }
 
   render() {
-    const currentBranch = this.state.checkingOutBranch || this.props.branchName;
+    const currentBranchName = this.state.checkingOutBranch || this.props.currentBranch.name;
     const branches = this.props.branches;
     if (this.state.checkingOutBranch && this.props.branches.indexOf(this.state.checkingOutBranch) === -1) {
       branches.push(this.state.checkingOutBranch);
@@ -53,7 +58,10 @@ export default class BranchMenuView extends React.Component {
       <select
         className="github-BranchMenuView-item github-BranchMenuView-select input-select"
         onChange={this.didSelectItem}
-        value={currentBranch}>
+        value={currentBranchName}>
+        {this.props.currentBranch.isDetached &&
+          <option key="detached" value="detached" disabled>{this.props.currentBranch.name}</option>
+        }
         {branches.map(branch => {
           return <option key={branch} value={branch}>{branch}</option>;
         })}
diff --git a/lib/views/branch-view.js b/lib/views/branch-view.js
index 93e8887474..06d70a96b4 100644
--- a/lib/views/branch-view.js
+++ b/lib/views/branch-view.js
@@ -1,15 +1,22 @@
 import React from 'react';
+import cx from 'classnames';
+
+import {BranchPropType} from '../prop-types';
 
 export default class BranchView extends React.Component {
   static propTypes = {
-    branchName: React.PropTypes.string,
+    currentBranch: BranchPropType,
   }
 
   render() {
+    const classNames = cx(
+      'github-branch', 'inline-block', {'github-branch-detached': this.props.currentBranch.isDetached},
+    );
+
     return (
-      <div className="github-branch inline-block" ref={e => { this.element = e; }}>
+      <div className={classNames} ref={e => { this.element = e; }}>
         <span className="icon icon-git-branch" />
-        <span className="branch-label">{this.props.branchName}</span>
+        <span className="branch-label">{this.props.currentBranch.name}</span>
       </div>
     );
   }
diff --git a/lib/views/commit-view.js b/lib/views/commit-view.js
index 4b8e603e76..b7836f848e 100644
--- a/lib/views/commit-view.js
+++ b/lib/views/commit-view.js
@@ -47,6 +47,10 @@ export default class CommitView {
     } else if (this.getRemainingCharacters() < this.props.maximumCharacterLimit / 4) {
       remainingCharsClassName = 'is-warning';
     }
+
+    const showAbortMergeButton = this.props.isMerging || null;
+    const showAmendBox = (!this.props.isMerging && !this.props.lastCommit.unbornRef) || null;
+
     return (
       <div className="github-CommitView" ref="CommitView">
         <div className="github-CommitView-editor">
@@ -61,18 +65,21 @@ export default class CommitView {
           />
         </div>
         <footer className="github-CommitView-bar">
-          <button ref="abortMergeButton" className="btn github-CommitView-button is-secondary"
-            onclick={this.abortMerge}
-            style={{display: this.props.isMerging ? '' : 'none'}}>Abort Merge</button>
-          <label className="github-CommitView-label input-label" style={{display: this.props.isMerging ? 'none' : ''}}>
-            <input
-              ref="amend"
-              className="input-checkbox"
-              type="checkbox"
-              onclick={this.handleAmendBoxClick}
-              checked={this.props.isAmending}
-            /> Amend
-          </label>
+          {showAbortMergeButton &&
+            <button ref="abortMergeButton" className="btn github-CommitView-button is-secondary"
+              onclick={this.abortMerge}>Abort Merge</button>
+          }
+          {showAmendBox &&
+            <label className="github-CommitView-label input-label">
+              <input
+                ref="amend"
+                className="input-checkbox"
+                type="checkbox"
+                onclick={this.handleAmendBoxClick}
+                checked={this.props.isAmending}
+              /> Amend
+            </label>
+          }
           <button ref="commitButton" className="btn github-CommitView-button"
             onclick={this.commit}
             disabled={!this.isCommitButtonEnabled()}>{this.commitButtonText()}</button>
diff --git a/lib/views/push-pull-menu-view.js b/lib/views/push-pull-menu-view.js
index 4d3fc11d61..f842b0684e 100644
--- a/lib/views/push-pull-menu-view.js
+++ b/lib/views/push-pull-menu-view.js
@@ -2,12 +2,13 @@ import React from 'react';
 import {autobind} from 'core-decorators';
 
 import {GitError} from '../git-shell-out-strategy';
+import {BranchPropType} from '../prop-types';
 
 export default class PushPullMenuView extends React.Component {
   static propTypes = {
     inProgress: React.PropTypes.bool,
     pullDisabled: React.PropTypes.bool,
-    branchName: React.PropTypes.string,
+    currentBranch: BranchPropType,
     remoteName: React.PropTypes.string,
     aheadCount: React.PropTypes.number,
     behindCount: React.PropTypes.number,
@@ -16,6 +17,10 @@ export default class PushPullMenuView extends React.Component {
   static defaultProps = {
     inProgress: false,
     pullDisabled: false,
+    currentBranch: {
+      name: '',
+      isDetached: false,
+    },
   }
 
   constructor(props, context) {
@@ -28,32 +33,27 @@ export default class PushPullMenuView extends React.Component {
 
   render() {
     const errorMessage = this.getErrorMessage();
+    const fetchDisabled = !this.props.remoteName || this.props.inProgress;
+    const pullDisabled = !this.props.remoteName || this.props.pullDisabled ||
+      this.props.currentBranch.isDetached || this.props.inProgress;
+    const pushDisabled = this.props.currentBranch.isDetached || this.props.inProgress;
 
     return (
       <div className={'github-PushPullMenuView' + (this.props.inProgress ? ' in-progress' : '')}>
         <div className="github-PushPullMenuView-selector">
           <span className="github-PushPullMenuView-item icon icon-mark-github" />
-          <button
-            className="github-PushPullMenuView-item btn"
-            onClick={this.fetch}
-            disabled={!this.props.remoteName || this.props.inProgress}>
+          <button className="github-PushPullMenuView-item btn" onClick={this.fetch} disabled={fetchDisabled}>
             Fetch
           </button>
 
           <div className="github-PushPullMenuView-item is-flexible btn-group">
-            <button
-              className="btn github-PushPullMenuView-pull"
-              onClick={this.pull}
-              disabled={!this.props.remoteName || this.props.pullDisabled || this.props.inProgress}>
+            <button className="btn github-PushPullMenuView-pull" onClick={this.pull} disabled={pullDisabled}>
               <span className="icon icon-arrow-down" />
               <span>
                 Pull {this.props.behindCount ? `(${this.props.behindCount})` : ''}
               </span>
             </button>
-            <button
-              className="btn github-PushPullMenuView-push"
-              onClick={this.push}
-              disabled={this.props.inProgress}>
+            <button className="btn github-PushPullMenuView-push" onClick={this.push} disabled={pushDisabled}>
               <span className="icon icon-arrow-up" />
               <span>
                 Push {this.props.aheadCount ? `(${this.props.aheadCount})` : ''}
@@ -73,8 +73,12 @@ export default class PushPullMenuView extends React.Component {
       return this.state.errorMessage;
     }
 
+    if (this.props.currentBranch.isDetached) {
+      return 'Note: you are not on a branch. Please create one if you wish to push your work anywhere.';
+    }
+
     if (!this.props.remoteName) {
-      return `Note: No remote detected for branch ${this.props.branchName}. ` +
+      return `Note: No remote detected for branch ${this.props.currentBranch.name}. ` +
         'Pushing will set up a remote tracking branch on remote repo "origin"';
     }
 
diff --git a/styles/status-bar-tile-controller.less b/styles/status-bar-tile-controller.less
index b00b34f352..21bdfa78fe 100644
--- a/styles/status-bar-tile-controller.less
+++ b/styles/status-bar-tile-controller.less
@@ -41,4 +41,8 @@
     animation: github-StatusBarSync-animation 2s linear 30; // limit to 1min in case something gets stuck
   }
 
+  .github-branch-detached {
+    color: @text-color-subtle;
+    font-style: italic;
+  }
 }
diff --git a/test/controllers/commit-view-controller.test.js b/test/controllers/commit-view-controller.test.js
index bf6a66d18e..e29206c8bd 100644
--- a/test/controllers/commit-view-controller.test.js
+++ b/test/controllers/commit-view-controller.test.js
@@ -2,11 +2,13 @@ import CommitViewController from '../../lib/controllers/commit-view-controller';
 import {cloneRepository, buildRepository} from '../helpers';
 
 describe('CommitViewController', function() {
-  let atomEnvironment, commandRegistry;
+  let atomEnvironment, commandRegistry, lastCommit;
 
   beforeEach(function() {
     atomEnvironment = global.buildAtomEnvironment();
     commandRegistry = atomEnvironment.commands;
+
+    lastCommit = {sha: 'a1e23fd45', message: 'last commit message', unbornRef: false};
   });
 
   afterEach(function() {
@@ -18,7 +20,7 @@ describe('CommitViewController', function() {
     const repository1 = await buildRepository(workdirPath1);
     const workdirPath2 = await cloneRepository('three-files');
     const repository2 = await buildRepository(workdirPath2);
-    const controller = new CommitViewController({commandRegistry, repository: repository1});
+    const controller = new CommitViewController({commandRegistry, lastCommit, repository: repository1});
 
     assert.equal(controller.regularCommitMessage, '');
     assert.equal(controller.amendingCommitMessage, '');
@@ -36,13 +38,12 @@ describe('CommitViewController', function() {
   });
 
   describe('the passed commit message', function() {
-    let controller, commitView, lastCommit;
+    let controller, commitView;
     beforeEach(async function() {
       const workdirPath = await cloneRepository('three-files');
       const repository = await buildRepository(workdirPath);
-      controller = new CommitViewController({commandRegistry, repository});
+      controller = new CommitViewController({commandRegistry, lastCommit, repository});
       commitView = controller.refs.commitView;
-      lastCommit = {sha: 'a1e23fd45', message: 'last commit message'};
     });
 
     it('is set to the regularCommitMessage in the default case', async function() {
diff --git a/test/controllers/root-controller.test.js b/test/controllers/root-controller.test.js
index b594211e7a..d7b18ffc72 100644
--- a/test/controllers/root-controller.test.js
+++ b/test/controllers/root-controller.test.js
@@ -9,13 +9,15 @@ import {cloneRepository, buildRepository} from '../helpers';
 import RootController from '../../lib/controllers/root-controller';
 
 describe('RootController', function() {
-  let atomEnv, workspace, commandRegistry, notificationManager, confirm, app;
+  let atomEnv, workspace, commandRegistry, notificationManager, tooltips, confirm, app;
 
   beforeEach(function() {
     atomEnv = global.buildAtomEnvironment();
     workspace = atomEnv.workspace;
     commandRegistry = atomEnv.commands;
     notificationManager = atomEnv.notifications;
+    tooltips = atomEnv.tooltips;
+
     confirm = sinon.stub(atomEnv, 'confirm');
 
     app = (
@@ -23,6 +25,7 @@ describe('RootController', function() {
         workspace={workspace}
         commandRegistry={commandRegistry}
         notificationManager={notificationManager}
+        tooltips={tooltips}
         confirm={confirm}
       />
     );
diff --git a/test/controllers/status-bar-tile-controller.test.js b/test/controllers/status-bar-tile-controller.test.js
index fb42481389..0ca38447f2 100644
--- a/test/controllers/status-bar-tile-controller.test.js
+++ b/test/controllers/status-bar-tile-controller.test.js
@@ -54,7 +54,20 @@ describe('StatusBarTileController', function() {
       const wrapper = mount(React.cloneElement(component, {repository}));
       await wrapper.instance().refreshModelData();
 
-      assert.equal(wrapper.find(BranchView).prop('branchName'), 'master');
+      assert.equal(wrapper.find(BranchView).prop('currentBranch').name, 'master');
+      assert.lengthOf(wrapper.find(BranchView).find('.github-branch-detached'), 0);
+    });
+
+    it('styles a detached HEAD differently', async function() {
+      const workdirPath = await cloneRepository('multiple-commits');
+      const repository = await buildRepository(workdirPath);
+      await repository.checkout('HEAD~2');
+
+      const wrapper = mount(React.cloneElement(component, {repository}));
+      await wrapper.instance().refreshModelData();
+
+      assert.equal(wrapper.find(BranchView).prop('currentBranch').name, 'master~2');
+      assert.lengthOf(wrapper.find(BranchView).find('.github-branch-detached'), 1);
     });
 
     describe('the branch menu', function() {
@@ -84,17 +97,17 @@ describe('StatusBarTileController', function() {
           const branches = Array.from(tip.getElementsByTagName('option'), e => e.innerHTML);
           assert.deepEqual(branches, ['branch', 'master']);
 
-          assert.equal(await repository.getCurrentBranch(), 'master');
+          assert.deepEqual(await repository.getCurrentBranch(), {name: 'master', isDetached: false});
           assert.equal(tip.querySelector('select').value, 'master');
 
           selectOption(tip, 'branch');
-          assert.equal(await repository.getCurrentBranch(), 'branch');
+          assert.deepEqual(await repository.getCurrentBranch(), {name: 'branch', isDetached: false});
           assert.equal(tip.querySelector('select').value, 'branch');
           await wrapper.instance().refreshModelData();
           assert.equal(tip.querySelector('select').value, 'branch');
 
           selectOption(tip, 'master');
-          assert.equal(await repository.getCurrentBranch(), 'master');
+          assert.deepEqual(await repository.getCurrentBranch(), {name: 'master', isDetached: false});
           assert.equal(tip.querySelector('select').value, 'master');
           await wrapper.instance().refreshModelData();
           assert.equal(tip.querySelector('select').value, 'master');
@@ -117,7 +130,7 @@ describe('StatusBarTileController', function() {
 
           const tip = getTooltipNode(wrapper, BranchView);
 
-          assert.equal(await repository.getCurrentBranch(), 'branch');
+          assert.deepEqual(await repository.getCurrentBranch(), {name: 'branch', isDetached: false});
           assert.equal(tip.querySelector('select').value, 'branch');
 
           sinon.stub(notificationManager, 'addError');
@@ -149,7 +162,7 @@ describe('StatusBarTileController', function() {
 
           const branches = Array.from(tip.querySelectorAll('option'), option => option.value);
           assert.deepEqual(branches, ['master']);
-          assert.equal(await repository.getCurrentBranch(), 'master');
+          assert.deepEqual(await repository.getCurrentBranch(), {name: 'master', isDetached: false});
           assert.equal(tip.querySelector('select').value, 'master');
 
           tip.querySelector('button').click();
@@ -166,7 +179,7 @@ describe('StatusBarTileController', function() {
           });
 
           assert.equal(tip.querySelector('select').value, 'new-branch');
-          assert.equal(await repository.getCurrentBranch(), 'new-branch');
+          assert.deepEqual(await repository.getCurrentBranch(), {name: 'new-branch', isDetached: false});
 
           assert.lengthOf(tip.querySelectorAll('.github-BranchMenuView-editor'), 0);
           assert.lengthOf(tip.querySelectorAll('select'), 1);
@@ -185,7 +198,7 @@ describe('StatusBarTileController', function() {
 
           const branches = Array.from(tip.getElementsByTagName('option'), option => option.value);
           assert.deepEqual(branches, ['branch', 'master']);
-          assert.equal(await repository.getCurrentBranch(), 'branch');
+          assert.deepEqual(await repository.getCurrentBranch(), {name: 'branch', isDetached: false});
           assert.equal(tip.querySelector('select').value, 'branch');
 
           tip.querySelector('button').click();
@@ -197,10 +210,27 @@ describe('StatusBarTileController', function() {
           assert.equal(notificationArgs[0], 'Cannot create branch');
           assert.match(notificationArgs[1].description, /already exists/);
 
-          assert.equal(await repository.getCurrentBranch(), 'branch');
+          assert.deepEqual(await repository.getCurrentBranch(), {name: 'branch', isDetached: false});
           assert.equal(tip.querySelector('select').value, 'branch');
         });
       });
+
+      describe('with a detached HEAD', function() {
+        it('includes the current describe output as a disabled option', async function() {
+          const workdirPath = await cloneRepository('multiple-commits');
+          const repository = await buildRepository(workdirPath);
+          await repository.checkout('HEAD~2');
+
+          const wrapper = mount(React.cloneElement(component, {repository}));
+          await wrapper.instance().refreshModelData();
+
+          const tip = getTooltipNode(wrapper, BranchView);
+          assert.equal(tip.querySelector('select').value, 'detached');
+          const option = tip.querySelector('option[value="detached"]');
+          assert.equal(option.textContent, 'master~2');
+          assert.isTrue(option.disabled);
+        });
+      });
     });
   });
 
@@ -314,6 +344,33 @@ describe('StatusBarTileController', function() {
         await assert.async.equal(pushButton.textContent, 'Push ');
         await assert.async.equal(pullButton.textContent, 'Pull ');
       });
+
+      describe('with a detached HEAD', function() {
+        let wrapper;
+
+        beforeEach(async function() {
+          const workdirPath = await cloneRepository('multiple-commits');
+          const repository = await buildRepository(workdirPath);
+          await repository.checkout('HEAD~2');
+
+          wrapper = mount(React.cloneElement(component, {repository}));
+          await wrapper.instance().refreshModelData();
+        });
+
+        it('disables the fetch, pull, and push buttons', function() {
+          const tip = getTooltipNode(wrapper, PushPullView);
+
+          assert.isTrue(tip.querySelector('button.github-PushPullMenuView-pull').disabled);
+          assert.isTrue(tip.querySelector('button.github-PushPullMenuView-push').disabled);
+        });
+
+        it('displays an appropriate explanation', function() {
+          const tip = getTooltipNode(wrapper, PushPullView);
+
+          const message = tip.querySelector('.github-PushPullMenuView-message');
+          assert.match(message.textContent, /not on a branch/);
+        });
+      });
     });
 
     describe('fetch and pull commands', function() {
diff --git a/test/git-strategies.test.js b/test/git-strategies.test.js
index eabd02d9b6..278eb2f09e 100644
--- a/test/git-strategies.test.js
+++ b/test/git-strategies.test.js
@@ -6,7 +6,7 @@ import mkdirp from 'mkdirp';
 import CompositeGitStrategy from '../lib/composite-git-strategy';
 import GitShellOutStrategy, {GitError} from '../lib/git-shell-out-strategy';
 
-import {cloneRepository, assertDeepPropertyVals, setUpLocalAndRemoteRepositories} from './helpers';
+import {cloneRepository, initRepository, assertDeepPropertyVals, setUpLocalAndRemoteRepositories} from './helpers';
 
 /**
  * KU Thoughts: The GitShellOutStrategy methods are tested in Repository tests for the most part
@@ -136,6 +136,26 @@ import {cloneRepository, assertDeepPropertyVals, setUpLocalAndRemoteRepositories
       });
     });
 
+    describe('getHeadCommit()', function() {
+      it('gets the SHA and message of the most recent commit', async function() {
+        const workingDirPath = await cloneRepository('three-files');
+        const git = createTestStrategy(workingDirPath);
+
+        const commit = await git.getHeadCommit();
+        assert.equal(commit.sha, '66d11860af6d28eb38349ef83de475597cb0e8b4');
+        assert.equal(commit.message, 'Initial commit');
+        assert.isFalse(commit.unbornRef);
+      });
+
+      it('notes when HEAD is an unborn ref', async function() {
+        const workingDirPath = await initRepository();
+        const git = createTestStrategy(workingDirPath);
+
+        const commit = await git.getHeadCommit();
+        assert.isTrue(commit.unbornRef);
+      });
+    });
+
     describe('diffFileStatus', function() {
       it('returns an object with working directory file diff status between relative to specified target commit', async function() {
         const workingDirPath = await cloneRepository('three-files');
@@ -492,15 +512,30 @@ import {cloneRepository, assertDeepPropertyVals, setUpLocalAndRemoteRepositories
       it('returns the current branch name', async function() {
         const workingDirPath = await cloneRepository('merge-conflict');
         const git = createTestStrategy(workingDirPath);
-        assert.equal(await git.getCurrentBranch(), 'master');
+        assert.deepEqual(await git.getCurrentBranch(), {name: 'master', isDetached: false});
         await git.checkout('branch');
-        assert.equal(await git.getCurrentBranch(), 'branch');
+        assert.deepEqual(await git.getCurrentBranch(), {name: 'branch', isDetached: false});
 
         // newBranch does not yet exist
         await assert.isRejected(git.checkout('newBranch'));
-        assert.equal(await git.getCurrentBranch(), 'branch');
+        assert.deepEqual(await git.getCurrentBranch(), {name: 'branch', isDetached: false});
         await git.checkout('newBranch', {createNew: true});
-        assert.equal(await git.getCurrentBranch(), 'newBranch');
+        assert.deepEqual(await git.getCurrentBranch(), {name: 'newBranch', isDetached: false});
+      });
+
+      it('returns the current branch name in a repository with no commits', async function() {
+        const workingDirPath = await initRepository();
+        const git = createTestStrategy(workingDirPath);
+
+        assert.deepEqual(await git.getCurrentBranch(), {name: 'master', isDetached: false});
+      });
+
+      it('returns a reasonable default in a repository with a detached HEAD', async function() {
+        const workingDirPath = await cloneRepository('multiple-commits');
+        const git = createTestStrategy(workingDirPath);
+        await git.exec(['checkout', 'HEAD^']);
+
+        assert.deepEqual(await git.getCurrentBranch(), {name: 'master~1', isDetached: true});
       });
     });
 
diff --git a/test/helpers.js b/test/helpers.js
index 2cd868ca40..73b873fc6b 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -37,6 +37,16 @@ export async function cloneRepository(repoName = 'three-files') {
   return copyCachedRepo(repoName);
 }
 
+/*
+ * Initialize an empty repository at a temporary path.
+ */
+export async function initRepository(repoName) {
+  const workingDirPath = temp.mkdirSync('git-fixture-');
+  const git = new GitShellOutStrategy(workingDirPath);
+  await git.exec(['init']);
+  return fs.realpathSync(workingDirPath);
+}
+
 export async function setUpLocalAndRemoteRepositories(repoName = 'multiple-commits', options = {}) {
   /* eslint-disable no-param-reassign */
   if (typeof repoName === 'object') {
diff --git a/test/views/commit-view.test.js b/test/views/commit-view.test.js
index aa638ceb70..5c42e20417 100644
--- a/test/views/commit-view.test.js
+++ b/test/views/commit-view.test.js
@@ -5,11 +5,13 @@ import until from 'test-until';
 import CommitView from '../../lib/views/commit-view';
 
 describe('CommitView', function() {
-  let atomEnv, commandRegistry;
+  let atomEnv, commandRegistry, lastCommit;
 
   beforeEach(function() {
     atomEnv = global.buildAtomEnvironment();
     commandRegistry = atomEnv.commands;
+
+    lastCommit = {sha: '1234abcd', message: 'commit message', unbornRef: false};
   });
 
   afterEach(function() {
@@ -17,7 +19,10 @@ describe('CommitView', function() {
   });
 
   it('displays the remaining characters limit based on which line is being edited', async function() {
-    const view = new CommitView({commandRegistry, stagedChangesExist: true, maximumCharacterLimit: 72, message: ''});
+    const view = new CommitView({
+      commandRegistry, lastCommit,
+      stagedChangesExist: true, maximumCharacterLimit: 72, message: '',
+    });
     assert.equal(view.refs.remainingCharacters.textContent, '72');
 
     await view.update({message: 'abcde fghij'});
@@ -64,7 +69,10 @@ describe('CommitView', function() {
       const workdirPath = await cloneRepository('three-files');
       const repository = await buildRepository(workdirPath);
       const viewState = {};
-      view = new CommitView({repository, commandRegistry, stagedChangesExist: true, mergeConflictsExist: false, viewState});
+      view = new CommitView({
+        repository, commandRegistry, lastCommit,
+        stagedChangesExist: true, mergeConflictsExist: false, viewState,
+      });
       editor = view.refs.editor;
       commitButton = view.refs.commitButton;
 
@@ -107,7 +115,10 @@ describe('CommitView', function() {
       const prepareToCommit = () => Promise.resolve(prepareToCommitResolution);
 
       commit = sinon.spy();
-      view = new CommitView({commandRegistry, stagedChangesExist: true, prepareToCommit, commit, message: 'Something'});
+      view = new CommitView({
+        commandRegistry, lastCommit,
+        stagedChangesExist: true, prepareToCommit, commit, message: 'Something',
+      });
       sinon.spy(view, 'focus');
 
       editor = view.refs.editor;
@@ -158,20 +169,22 @@ describe('CommitView', function() {
   });
 
   it('shows the "Abort Merge" button when props.isMerging is true', async function() {
-    const view = new CommitView({commandRegistry, stagedChangesExist: true, isMerging: false});
-    const {abortMergeButton} = view.refs;
-    assert.equal(abortMergeButton.style.display, 'none');
+    const view = new CommitView({commandRegistry, lastCommit, stagedChangesExist: true, isMerging: false});
+    assert.isUndefined(view.refs.abortMergeButton);
 
     await view.update({isMerging: true});
-    assert.equal(abortMergeButton.style.display, '');
+    assert.isDefined(view.refs.abortMergeButton);
 
     await view.update({isMerging: false});
-    assert.equal(abortMergeButton.style.display, 'none');
+    assert.isUndefined(view.refs.abortMergeButton);
   });
 
   it('calls props.abortMerge() when the "Abort Merge" button is clicked', function() {
     const abortMerge = sinon.spy(() => Promise.resolve());
-    const view = new CommitView({commandRegistry, stagedChangesExist: true, isMerging: true, abortMerge});
+    const view = new CommitView({
+      commandRegistry, lastCommit,
+      stagedChangesExist: true, isMerging: true, abortMerge,
+    });
     const {abortMergeButton} = view.refs;
     abortMergeButton.dispatchEvent(new MouseEvent('click'));
     assert(abortMerge.calledOnce);
@@ -180,7 +193,10 @@ describe('CommitView', function() {
   describe('amending', function() {
     it('calls props.setAmending() when the box is checked or unchecked', function() {
       const setAmending = sinon.spy();
-      const view = new CommitView({commandRegistry, stagedChangesExist: false, lastCommit: {message: 'previous commit\'s message'}, setAmending});
+      const view = new CommitView({
+        commandRegistry,
+        stagedChangesExist: false, lastCommit: {message: 'previous commit\'s message'}, setAmending,
+      });
       const {amend} = view.refs;
 
       amend.click();
@@ -189,5 +205,14 @@ describe('CommitView', function() {
       amend.click();
       assert.deepEqual(setAmending.args, [[true], [false]]);
     });
+
+    it('is hidden when HEAD is an unborn ref', function() {
+      const view = new CommitView({
+        commandRegistry,
+        stagedChangesExist: false,
+        lastCommit: {unbornRef: true},
+      });
+      assert.isUndefined(view.refs.amend);
+    });
   });
 });