gistfile1.txt

~/Projects/SeBuilderSiteNew/se-builder $ git status
# On branch gh-pages
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   repository.json
#
no changes added to commit (use "git add" and/or "git commit -a")
~/Projects/SeBuilderSiteNew/se-builder $ git add .
~/Projects/SeBuilderSiteNew/se-builder $ git commit -a -m 'Updated repository to point at new Sauce for Se Builder location.'
[gh-pages 62d43be] Updated repository to point at new Sauce for Se Builder location.
 1 file changed, 2 insertions(+), 2 deletions(-)
~/Projects/SeBuilderSiteNew/se-builder $ git push origin gh-pages
To [email protected]:sebuilder/se-builder.git
 ! [rejected]        gh-pages -> gh-pages (non-fast-forward)
error: failed to push some refs to '[email protected]:sebuilder/se-builder.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
~/Projects/SeBuilderSiteNew/se-builder $ git pull
remote: Counting objects: 102, done.
remote: Compressing objects: 100% (67/67), done.
remote: Total 89 (delta 45), reused 58 (delta 14)
Unpacking objects: 100% (89/89), done.
From github.com:sebuilder/se-builder
 * [new branch]      gh-pages   -> origin/gh-pages
 * [new branch]      master     -> origin/master
 * [new branch]      newcore    -> origin/newcore
You asked me to pull without telling me which branch you
want to merge with, and 'branch.gh-pages.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:
    [branch "gh-pages"]
    remote = <nickname>
    merge = <remote-ref>

    [remote "<nickname>"]
    url = <url>
    fetch = <refspec>

See git-config(1) for details.
~/Projects/SeBuilderSiteNew/se-builder $ git push origin gh-pages
To [email protected]:sebuilder/se-builder.git
 ! [rejected]        gh-pages -> gh-pages (non-fast-forward)
error: failed to push some refs to '[email protected]:sebuilder/se-builder.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
~/Projects/SeBuilderSiteNew/se-builder $ git sob
git: 'sob' is not a git command. See 'git --help'.

Did you mean this?
	show
~/Projects/SeBuilderSiteNew/se-builder $ git status
# On branch gh-pages
nothing to commit (working directory clean)
~/Projects/SeBuilderSiteNew/se-builder $