gistfile1.txt

git add Bio/DB/SeqFeature/Store/DBI/mysql.pm

git commit
Created commit ec01fac: Adding my updated version of the DBI/mysql.pm which fixes problems when using -namespace. I thought this had been comitted elsewhere and pulled by me, but I guess I'm git'ing confused. You see what I did there?
 1 files changed, 68 insertions(+), 64 deletions(-)

git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       Bio/ASN1/
nothing added to commit but untracked files present (use "git add" to track)

git pull origin
Merge made by recursive.
 Bio/Annotation/DBLink.pm      |   25 +++-
 Bio/SeqIO/seqxml.pm           |    6 +-
 scripts/bioperl_netinstall.pl |  427 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 454 insertions(+), 4 deletions(-)
 create mode 100755 scripts/bioperl_netinstall.pl

git push dbolser
To [email protected]:dbolser/bioperl-live.git
 ! [rejected]        master -> master (non-fast forward)
error: failed to push some refs to '[email protected]:dbolser/bioperl-live.git'




[dbolser@nanna bioperl-live]$ git pull dbolser
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From [email protected]:dbolser/bioperl-live
 * [new branch]      anydbm-branch -> dbolser/anydbm-branch
 * [new branch]      branch-1-6 -> dbolser/branch-1-6
 * [new branch]      master     -> dbolser/master
 * [new branch]      my_root_branch -> dbolser/my_root_branch
 * [new branch]      topic/adsj-seqobj-return -> dbolser/topic/adsj-seqobj-return
 * [new branch]      topic/davemessina-multiphylip -> dbolser/topic/davemessina-multiphylip
 * [new branch]      topic/lstein-seqfeature-store-summaries -> dbolser/topic/lstein-seqfeature-store-summaries
 * [new branch]      topic/switch_sf_annotated -> dbolser/topic/switch_sf_annotated
 * [new branch]      topic/update-1-6 -> dbolser/topic/update-1-6
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either.  Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

    branch.master.remote = <nickname>
    branch.master.merge = <remote-ref>
    remote.<nickname>.url = <url>
    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.