I changed Revert changes in git gui.Then run these commands g0t following result:
ResultCode:git status git pull origin master
Code:sherly@HOME:~/www/imagehostnow.com$ git status On branch master Your branch is behind 'origin/master' by 34 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: app/storage/.gitignore modified: app/storage/cache/.gitignore modified: app/storage/logs/.gitignore modified: app/storage/meta/.gitignore modified: app/storage/sessions/.gitignore modified: app/storage/views/.gitignore no changes added to commit (use "git add" and/or "git commit -a") sherly@HOME:~/www/imagehostnow.com$ git pull origin master From ssh://git.buyscripts.in:10022/buyscripts/imagehost * branch master -> FETCH_HEAD Updating 1316183..8ffcaab Fast-forward .gitignore | 4 +- README/install.txt | 1 + app/config/database.php | 6 +-- app/controllers/GalleryController.php | 15 ++++++ app/controllers/ImageController.php | 18 ++----- app/controllers/UploadController.php | 23 ++++---- .../2015_01_06_090738_create_table_images.php | 2 +- .../2015_01_16_062107_add_uid_in_images.php | 30 +++++++++++ ...7_032543_alter_table_images_folder_nullable.php | 28 ++++++++++ ...7_085023_alter_table_images_remove_seo_name.php | 30 +++++++++++ ..._01_17_094457_alter_table_images_remove_uid.php | 30 +++++++++++ app/models/Image.php | 27 +++++++++- app/models/Thumb.php | 58 +++++++++++++++++++++ app/routes.php | 5 +- app/views/admin/image/view.blade.php | 4 +- .../gallery.blade.php => gallery/index.blade.php} | 2 +- app/views/home/index.blade.php | 2 +- app/views/image/index.blade.php | 13 +---- app/views/layouts/master.blade.php | 2 +- app/views/upload/success.blade.php | 29 ----------- app/views/user/images.blade.php | 4 +- public/css/style.css | 3 ++ public/images/logo.png | Bin 0 -> 2337 bytes 23 files changed, 252 insertions(+), 84 deletions(-) create mode 100644 README/install.txt create mode 100644 app/controllers/GalleryController.php create mode 100644 app/database/migrations/2015_01_16_062107_add_uid_in_images.php create mode 100644 app/database/migrations/2015_01_17_032543_alter_table_images_folder_nullable.php create mode 100644 app/database/migrations/2015_01_17_085023_alter_table_images_remove_seo_name.php create mode 100644 app/database/migrations/2015_01_17_094457_alter_table_images_remove_uid.php create mode 100644 app/models/Thumb.php rename app/views/{image/gallery.blade.php => gallery/index.blade.php} (91%) delete mode 100644 app/views/upload/success.blade.php create mode 100644 public/images/logo.png sherly@HOME:~/www/imagehostnow.com$




Reply With Quote
Bookmarks