This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long title. This is a very long titl
Test
Testing text to see if it works
northspace@crondananb MINGW32 ~
$ ssh [email protected]
[email protected]'s password:
Last login: Thu Apr 4 10:11:12 2019 from 93.77.20.161
[hearts@vps ~]$ cd laravel
[hearts@vps laravel]$ git pull
Password for 'https://[email protected]':
From https://bitbucket.org/margalitb/hearts
0e69af7..3701fe4 master -> origin/master
Already up to date.
[hearts@vps laravel]$ exit
logout
Connection to hearts.leverage.it closed.
northspace@crondananb MINGW32 ~
$ ssh jvl.leverage.it
[email protected]'s password:
Permission denied, please try again.
[email protected]'s password:
Permission denied, please try again.
[email protected]'s password:
northspace@crondananb MINGW32 ~
$ ssh [email protected]
[email protected]'s password:
Last login: Thu Mar 28 15:16:23 2019 from 99.252.167.66
[jvl@vps ~]$ cd website
[jvl@vps website]$ git pull
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 5), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From https://bitbucket.org/leverage-it/jvl-laravel
4755d68..bdd02fc development -> origin/development
Updating 4755d68..bdd02fc
Fast-forward
app/Http/Controllers/ImagesController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[jvl@vps website]$ cd app
[jvl@vps app]$ cd Http
[jvl@vps Http]$ cd Controllers
[jvl@vps Controllers]$ vi ImagesController.php
[jvl@vps Controllers]$ cd ..
[jvl@vps Http]$ cd ..
[jvl@vps app]$ cd ..
[jvl@vps website]$ git pull
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 5), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From https://bitbucket.org/leverage-it/jvl-laravel
bdd02fc..860bb03 development -> origin/development
Updating bdd02fc..860bb03
error: Your local changes to the following files would be overwritten by merge:
app/Http/Controllers/ImagesController.php
Please commit your changes or stash them before you merge.
Aborting
[jvl@vps website]$ git stash
*** Please tell me who you are.
Run
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: empty ident name (for <[email protected]>) not allowed
Cannot save the current index state
[jvl@vps website]$ git pull
Updating bdd02fc..860bb03
error: Your local changes to the following files would be overwritten by merge:
app/Http/Controllers/ImagesController.php
Please commit your changes or stash them before you merge.
Aborting
[jvl@vps website]$ git status
On branch development
Your branch is behind 'origin/development' by 1 commit, and can be fast-forwarde d.
(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/Http/Controllers/ImagesController.php
modified: public/.htaccess
modified: storage/.gitignore
modified: storage/app/.gitignore
modified: storage/framework/.gitignore
modified: storage/framework/cache/.gitignore
modified: storage/framework/sessions/.gitignore
modified: storage/logs/.gitignore
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
.composer/
.cpanel/
.dns
.lastlogin
.ssh/
.viminfo
composer.phar
error_log
public/error_log
storage/framework/views/
tmp/
no changes added to commit (use "git add" and/or "git commit -a")
[jvl@vps website]$ Connection reset by 199.102.228.10 port 22
northspace@crondananb MINGW32 ~
$ ssh [email protected]
[email protected]'s password:
Last login: Mon Apr 8 12:46:35 2019 from 104.195.206.88
[jvl@vps ~]$ cd website
[jvl@vps website]$ git reset app/Http/Controllers/ImagesController.php
Unstaged changes after reset:
M app/Http/Controllers/ImagesController.php
M public/.htaccess
M storage/.gitignore
M storage/app/.gitignore
M storage/framework/.gitignore
M storage/framework/cache/.gitignore
M storage/framework/sessions/.gitignore
M storage/logs/.gitignore
[jvl@vps website]$ git status
On branch development
Your branch is behind 'origin/development' by 1 commit, 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/Http/Controllers/ImagesController.php
modified: public/.htaccess
modified: storage/.gitignore
modified: storage/app/.gitignore
modified: storage/framework/.gitignore
modified: storage/framework/cache/.gitignore
modified: storage/framework/sessions/.gitignore
modified: storage/logs/.gitignore
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
.composer/
.cpanel/
.dns
.lastlogin
.ssh/
.viminfo
composer.phar
error_log
public/error_log
storage/framework/views/
tmp/
no changes added to commit (use "git add" and/or "git commit -a")
[jvl@vps website]$ git discard app/Http/Controller/ImagesController.php
git: 'discard' is not a git command. See 'git --help'.
[jvl@vps website]$ git revert app/Http/Controller/ImagesController.php
fatal: bad revision 'app/Http/Controller/ImagesController.php'
[jvl@vps website]$ git status
On branch development
Your branch is behind 'origin/development' by 1 commit, 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/Http/Controllers/ImagesController.php
modified: public/.htaccess
modified: storage/.gitignore
modified: storage/app/.gitignore
modified: storage/framework/.gitignore
modified: storage/framework/cache/.gitignore
modified: storage/framework/sessions/.gitignore
modified: storage/logs/.gitignore
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
.composer/
.cpanel/
.dns
.lastlogin
.ssh/
.viminfo
composer.phar
error_log
public/error_log
storage/framework/views/
tmp/
no changes added to commit (use "git add" and/or "git commit -a")
[jvl@vps website]$ vi app/Http/Controller/ImagesController.php
[jvl@vps website]$ vi app/Http/Controllers/ImagesController.php
[jvl@vps website]$ git stash app/Http/Controller/ImagesController.php
usage: git stash list [<options>]
or: git stash show [<stash>]
or: git stash drop [-q|--quiet] [<stash>]
or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
or: git stash branch <branchname> [<stash>]
or: git stash save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [<message>]
or: git stash [push [--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [-m <message>]
[-- <pathspec>...]]
or: git stash clear
[jvl@vps website]$ git stash
*** Please tell me who you are.
Run
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: empty ident name (for <[email protected]>) not allowed
Cannot save the current index state
[jvl@vps website]$ git config --global user.email "[email protected]"
[jvl@vps website]$ git config --global user.name "Margalit Brown"
[jvl@vps website]$ git stash
Saved working directory and index state WIP on development: bdd02fc Change initial directory to jsource/images
[jvl@vps website]$ git status
On branch development
Your branch is behind 'origin/development' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
.composer/
.cpanel/
.dns
.lastlogin
.ssh/
.viminfo
composer.phar
error_log
public/error_log
storage/framework/views/
tmp/
nothing added to commit but untracked files present (use "git add" to track)
[jvl@vps website]$ git pull
Updating bdd02fc..860bb03
Fast-forward
app/Http/Controllers/ImagesController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[jvl@vps website]$ ssh [email protected]
[email protected]'s password:
Permission denied, please try again.
[email protected]'s password:
[jvl@vps website]$ ssh @ssh.us-02.live-paas.net
asdfadsfasd
sadfsdfsadfasdsa
Test 1
dsdfsafasdfasdfasdfasdf
fgdfgdsfgfsdgsdfg