слить с master detached-ветку

kalinin@kalinin ~/rails/simply_catalog $ git hist --all
* 91d5440 2015-10-20 | work add nested comments (HEAD) [zlodiak]
* de24fd7 2015-10-20 | root comment form checked [zlodiak]
* d5bcf2c 2015-10-20 | add comment form for  show action worked [zlodiak]
* 82a316f 2015-10-19 | seeds few messages ok [zlodiak]
* d255aca 2015-10-19 | output comments ok [zlodiak]
* 511fcdf 2015-10-19 | seeds comments ok [zlodiak]
* f9b8398 2015-10-19 | assoc product and comments ok [zlodiak]
* 299478e 2015-10-19 | comments table create [zlodiak]
| * 3298d3d 2015-10-19 | hh (create_folder) [zlodiak]
| * 34b0477 2015-10-19 | fff [zlodiak]
| * 5052c08 2015-10-19 | assoc ok [zlodiak]
|/  
* 428ded1 2015-10-19 | scaffold ok [zlodiak]
* 7291fd7 2015-10-18 | product create ok (master, create_prod) [zlodiak]
* 8c3e010 2015-10-18 | form for new ok [zlodiak]
* 70a2123 2015-10-18 | breadcrumbs ok (origin/master, crumbs) [zlodiak]
* 8c184b2 2015-10-18 | crumbs for folders ok [zlodiak]
* e860b10 2015-10-18 | before breadcrumbs products [zlodiak]
* 483a33f 2015-10-17 | crumbs without recursia ok [zlodiak]
* e3e8417 2015-10-16 | crumbs item and root ok [zlodiak]
* 82969b2 2015-10-16 | fff (import_csv) [zlodiak]
* 335ac63 2015-10-15 | link move [zlodiak]
* cc2b6ed 2015-10-15 | export action ok. all export ok (cat_save2) [zlodiak]
| * 9f53d2e 2015-10-14 | fff (cat_save) [zlodiak]
|/  
* 21d079d 2015-10-14 | controllers specs failed (cat_spec) [zlodiak]
* be4cfb3 2015-10-13 | validation models ok [zlodiak]
* 3890021 2015-10-13 | requests prod ok [zlodiak]
* 0a14051 2015-10-13 | 3 get req ok [zlodiak]
* 30662ba 2015-10-13 | products routing ok [zlodiak]
* 57bea77 2015-10-13 | rspec del factories move [zlodiak]
* 55a4de4 2015-10-13 | maintenance add [zlodiak]
* effa12e 2015-10-13 | color assoc ok (cat_output) [zlodiak]
* 236184d 2015-10-13 | assoc models spec ok [zlodiak]
* 66cff2a 2015-10-12 | rspec install ok [zlodiak]
* c4bf7e3 2015-10-12 | cycle seeds ok [zlodiak]
* 3af9e43 2015-10-12 | before seeds new [zlodiak]
* 4dd09b7 2015-10-12 | nested products ok links [zlodiak]
* e4e2d7e 2015-10-12 | catalog seeds ok (seeds) [zlodiak]
* 29a3ca6 2015-10-12 | to model add awesome ok [zlodiak]
* ad7dd96 2015-10-12 | before reset [zlodiak]
* 98a340f 2015-10-12 | awesome columns add [zlodiak]
* ad276dc 2015-10-12 | Revert "fff" [zlodiak]
* 1f63e46 2015-10-12 | fff [zlodiak]
* 110d7ff 2015-10-12 | awesome gem installed [zlodiak]
* ef4da34 2015-10-12 | product fields added ok [zlodiak]
* 0663329 2015-10-12 | generate controllers ok [zlodiak]
* c196363 2015-10-12 | first commit [zlodiak]
kalinin@kalinin ~/rails/simply_catalog $ git br
* (detached from 428ded1)
  cat_output
  cat_save
  cat_save2
  cat_spec
  create_folder
  create_prod
  crumbs
  import_csv
  master
  seeds

git co master
git merge целевая ветка

kalinin@kalinin ~/rails/simply_catalog $ git br
* (detached from 428ded1)