opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (master)$ git checkout -b test
Switched to a new branch 'test'
opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (test)$ touch foo
opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (test)$ git add foo
opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (test)$ git ci -m 'added foo'
[test 9268efb] added foo
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 Open-ILS/xul/staff_client/foo
opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (test)$ git pull origin
You asked to pull from the remote 'origin', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (test)$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.test.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 "test"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (test)$ git pull master
fatal: 'master' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (test)$ git merge master
Already up-to-date.
opensrf@dev141:~/git/Evergreen/Open-ILS/xul/staff_client (test)$ git config -l
user.name=Jason Etheridge
user.email=jason@esilibrary.com
alias.ci=commit
alias.co=checkout
alias.b=branch
color.diff=auto
color.status=auto
color.branch=auto
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git@git.evergreen-ils.org:Evergreen.git
branch.master.remote=origin
branch.master.merge=refs/heads/master
remote.eg-esi.url=git+ssh://phasefx@yeti.esilibrary.com/home/evergreen/evergreen-equinox
remote.eg-esi.fetch=+refs/heads/*:refs/remotes/eg-esi/*
remote.eg-esi-pvt.url=git+ssh://phasefx@yeti.esilibrary.com/home/evergreen/evergreen-equinox-pvt
remote.eg-esi-pvt.fetch=+refs/heads/*:refs/remotes/eg-esi-pvt/*
remote.tsbere.url=git://git.mvlcstaff.org/tsbere/ILS
remote.tsbere.fetch=+refs/heads/*:refs/remotes/tsbere/*
remote.working-eg.url=git@git.evergreen-ils.org:working/Evergreen.git
remote.working-eg.fetch=+refs/heads/*:refs/remotes/working-eg/*
branch.rel_2_1.remote=origin
branch.rel_2_1.merge=refs/heads/rel_2_1