Bosco Workflow

gistfile1.txt

Welcome to Git (version 1.7.7.1-preview20111027)


Run 'git help git' to display the help index.
Run 'git help <command>' to display help for specific commands.

Michael@BOFHJR ~ ((unknown))
$ cd UBTools/

Michael@BOFHJR ~/UBTools (master)
$ git pull UBound master
Enter passphrase for key '/c/Users/Michael/.ssh/id_rsa':
From github.com:University-Bound/UBTools
 * branch            master     -> FETCH_HEAD
Already up-to-date.

Michael@BOFHJR ~/UBTools (master)
$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 14 commits.
#
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   CakeMarketing/CakeMarketing/CakeMarketing.csproj
#       deleted:    CakeMarketing/CakeMarketing/Models/SHC.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/ActiveRecord1.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/Context1.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/Structs1.cs
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       CakeMarketing_Tests/CallCenter/
#       ClassDiagram1.cd
#       DatabaseProgramsTest.cs
no changes added to commit (use "git add" and/or "git commit -a")

Michael@BOFHJR ~/UBTools (master)
$ git checkout -b LPS-7
M       CakeMarketing/CakeMarketing/CakeMarketing.csproj
D       CakeMarketing/CakeMarketing/Models/SHC.cs
M       Lib/SubSonic/T4 Templates/ActiveRecord/ActiveRecord1.cs
M       Lib/SubSonic/T4 Templates/ActiveRecord/Context1.cs
M       Lib/SubSonic/T4 Templates/ActiveRecord/Structs1.cs
Switched to a new branch 'LPS-7'

Michael@BOFHJR ~/UBTools (LPS-7)
$ git status
# On branch LPS-7
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   CakeMarketing/CakeMarketing/CakeMarketing.csproj
#       deleted:    CakeMarketing/CakeMarketing/Models/SHC.cs
#       modified:   Database/ProgramData/SchoolPrograms2.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/ActiveRecord1.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/Context1.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/Structs1.cs
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       CakeMarketing_Tests/CallCenter/
#       ClassDiagram1.cd
#       DatabaseProgramsTest.cs
no changes added to commit (use "git add" and/or "git commit -a")

Michael@BOFHJR ~/UBTools (LPS-7)
$ git add Database/ProgramData/SchoolPrograms2.cs

Michael@BOFHJR ~/UBTools (LPS-7)
$ git commit
[LPS-7 f310575] Oh boy I added a Distinct clause
 1 files changed, 2 insertions(+), 2 deletions(-)

Michael@BOFHJR ~/UBTools (LPS-7)
$ git checkout master
M       CakeMarketing/CakeMarketing/CakeMarketing.csproj
D       CakeMarketing/CakeMarketing/Models/SHC.cs
M       Lib/SubSonic/T4 Templates/ActiveRecord/ActiveRecord1.cs
M       Lib/SubSonic/T4 Templates/ActiveRecord/Context1.cs
M       Lib/SubSonic/T4 Templates/ActiveRecord/Structs1.cs
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 14 commits.

Michael@BOFHJR ~/UBTools (master)
$ git merge LPS-7
Updating 88491bb..f310575
Fast-forward
 Database/ProgramData/SchoolPrograms2.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Michael@BOFHJR ~/UBTools (master)
$ git commit
# On branch master
# Your branch is ahead of 'origin/master' by 15 commits.
#
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   CakeMarketing/CakeMarketing/CakeMarketing.csproj
#       deleted:    CakeMarketing/CakeMarketing/Models/SHC.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/ActiveRecord1.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/Context1.cs
#       modified:   Lib/SubSonic/T4 Templates/ActiveRecord/Structs1.cs
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       CakeMarketing_Tests/CallCenter/
#       ClassDiagram1.cd
#       DatabaseProgramsTest.cs
no changes added to commit (use "git add" and/or "git commit -a")

Michael@BOFHJR ~/UBTools (master)
$ git push origin
Username for 'github.com':
Password for 'github.com':
fatal: Authentication failed

Michael@BOFHJR ~/UBTools (master)
$ git push origin master
Username for 'github.com':
Password for 'github.com':
Counting objects: 127, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (79/79), done.
Writing objects: 100% (80/80), 12.19 KiB, done.
Total 80 (delta 53), reused 0 (delta 0)
To https://github.com/mikebosco/UBTools.git
   1686701..f310575  master -> master

Michael@BOFHJR ~/UBTools (master)
$