Code

Test branch#2

Code

Open

ivinnikov wants to merge 55 commits intoscm-ninja:masterscm-ninja/starter-web:masterfrom ivinnikov:test-branchivinnikov/starter-web:test-branchCopy head branch name to clipboard

+56-8

Commits

Commits on Jul 8, 2015

• My first commit!

  

  ivinnikov

  committed
  a04bdbf

• adding more ipsom text

  

  Igor Vinnikov

  committed
  36d8a02

• adding new file

  

  Igor Vinnikov

  committed
  2a9ff7d

• More ipsum for hipsters

  

  Igor Vinnikov

  committed
  1e35f16

Commits on Jul 9, 2015

• Adding more ipsum text

  

  Igor Vinnikov

  committed
  60ee46c

• adding new file

  

  Igor Vinnikov

  committed
  c549626

• More ipsum for hipsters

  

  Igor Vinnikov

  committed
  8dba37b

• Adding several files recursively

  

  Igor Vinnikov

  committed
  6f79b44

• renaming level3 file

  

  Igor Vinnikov

  committed
  8a07dcb

• Renaming level 2 file

  

  Igor Vinnikov

  committed
  b2c14d9

• Moving file from level 2 to level 3

  

  Igor Vinnikov

  committed
  ad9a6f0

• Moving level 2file back to level2 directory

  

  Igor Vinnikov

  committed
  ad1c659

• renaming level 1 file

  

  Igor Vinnikov

  committed
  9a410a2

Commits on Jul 13, 2015

• deleting a new file

  

  Igor Vinnikov

  committed
  df4d1cd

• deleted hipster.txt file

  

  Igor Vinnikov

  committed
  c03421d

• adding three level of folders

  

  Igor Vinnikov

  committed
  d9078c7

• deleting level1 and all children

  

  Igor Vinnikov

  committed
  8286ce9

• Adding .gitignore file to exclude unwanted files

  

  Igor Vinnikov

  committed
  be2eb77

• Excluding log file directory

  

  Igor Vinnikov

  committed
  5e790c8

Commits on Jul 14, 2015

• Adding README file

  

  Igor Vinnikov

  committed
  9ad84e2

• Merge branch 'master' of https://github.com/ivinnikov/starter-web

  Show description for 7b3723e
  

  Igor Vinnikov

  committed
  7b3723e

• Adding new sction: Deployment

  

  Igor Vinnikov

  committed
  74b7c3e

• Adding description

  

  Igor Vinnikov

  committed
  25c17e8

• Adding introduction text

  

  Igor Vinnikov

  committed
  b96dc06

• Updatuing repo with changes from compare section

  

  Igor Vinnikov

  committed
  28ca319

• Changing title of HTML file

  

  Igor Vinnikov

  committed
  f3d7ed8

• Adding copyright notice

  

  Igor Vinnikov

  committed
  acf69cb

• Adding copyright notice to README.md

  

  Igor Vinnikov

  committed
  11d510b

• Merge branch 'add-copyright'

  

  Igor Vinnikov

  committed
  deb7510

• Adding team memeber to humans.txt

  

  Igor Vinnikov

  committed
  d97e945

• Adding instructions on how to contribute

  

  Igor Vinnikov

  committed
  70434ae

• Merging changes from simple-changes branch

  

  Igor Vinnikov

  committed
  885f8bc

• Making changes to simple.html

  

  Igor Vinnikov

  committed
  4a0659a

• Adding conflicting changes (on purpose) for Git example

  

  Igor Vinnikov

  committed
  ce38e04

• Done resolving merge conflicts

  

  Igor Vinnikov

  committed
  8e79559

• updating ignore file to exclude merge temp files

  

  Igor Vinnikov

  committed
  1a59bac

• Adding oneliner to README for rebase example

  

  Igor Vinnikov

  committed
  2044e4c

• Saying thanks to all my students

  

  Igor Vinnikov

  committed
  24f03bb

• Adding another change after rebase

  

  Igor Vinnikov

  committed
  da623ff

• mb before rebasing conflicts

  

  Igor Vinnikov

  committed
  48b7509

• mb conflicting changes brewing

  

  Igor Vinnikov

  committed
  7ad1903

• fb adding some trouble to simple.html file

  

  Igor Vinnikov

  committed
  1f2a8fe

• Adding changes after rebasing conflict

  

  Igor Vinnikov

  committed
  d3c6506

• remote: minor change to index.html file

  

  ivinnikov

  committed
  e5462ed

• local: updating simple.html copyright notice

  

  Igor Vinnikov

  committed
  f76c1f8

Commits on Jul 15, 2015

• Quick fix in production to improve copyright notice

  

  Igor Vinnikov

  committed
  d8f4ba3

• Done with simple.html updates

  

  Igor Vinnikov

  committed
  c41d84d

• Quick fix after stash on Readme file

  

  Igor Vinnikov

  committed
  1d0f711

• Updates to humans file after stashing

  

  Igor Vinnikov

  committed
  697ce75

• Changes after git-stash-branch command

  

  Igor Vinnikov

  committed
  1fc6db4

Commits on Aug 18, 2015

• Tweaking file for tagging example

  

  Igor Vinnikov

  committed
  a16e769

• Updating for tag 1.2

  

  Igor Vinnikov

  committed
  4a6fa06

• Merge branch 'master' of https://github.com/ivinnikov/starter-web

  Show description for 0333841
  

  Igor Vinnikov

  committed
  0333841

• Test commits to show diffs

  

  ivinnikov

  committed
  7def83b

• fixing typo

  

  ivinnikov

  committed
  5adb4a3