Setting environment for using XAMPP for Windows. USER@USER-PC c:\xampp
'USE' is not recognized as an internal or external command, operable program or batch file.
USER@USER-PC c:\xampp
mysql Ver 15.1 Distrib 10.1.19-MariaDB, for Win32 (AMD64)
Setting environment for using XAMPP for Windows. USER@USER-PC c:\xampp
'USE' is not recognized as an internal or external command, operable program or batch file.
USER@USER-PC c:\xampp
mysql Ver 15.1 Distrib 10.1.19-MariaDB, for Win32 (AMD64)
Setting environment for using XAMPP for Windows. USER@USER-PC c:\xampp
'scp' is not recognized as an internal or external command, operable program or batch file.
USER@USER-PC c:\xampp
mysql Ver 15.1 Distrib 10.1.19-MariaDB, for Win32 (AMD64)
USER@USER-PC MINGW32 ~/Documents/GitHub/tatoeba2 (delete-this-later) $ git checkout dev Switched to branch 'dev' Your branch is up-to-date with 'origin/dev'.
USER@USER-PC MINGW32 ~/Documents/GitHub/tatoeba2 (dev) $ git pull From https://github.com/RyckRichards/tatoeba2
USER@USER-PC MINGW32 ~/Desktop/Ricardo - Vernaut 30/Tat-GitHub/tatoeba2 (dev) $ git fetch upstream fatal: 'upstream' does not appear to be a git repository fatal: Could not read from remote repository.
Please make sure you have the correct access rights and the repository exists.
USER@USER-PC MINGW32 ~/Desktop/Ricardo - Vernaut 30/Tat-GitHub/tatoeba2 (dev)
I am testing Tatoeba on My Android 4.4.2 browser: opera mini
Homepage top buttons expected: aligned result: not OK
Usuario@pc MINGW32 ~/Desktop/Ricardo/Tatoeba_GitHub/RyckRichards/tatoeba2 (dev) | |
$ | |
Usuario@pc MINGW32 ~/Desktop/Ricardo/Tatoeba_GitHub/RyckRichards/tatoeba2 (dev) | |
$ git fetch upstream | |
Usuario@pc MINGW32 ~/Desktop/Ricardo/Tatoeba_GitHub/RyckRichards/tatoeba2 (dev) | |
$ git checkout dev | |
Already on 'dev' |
Usuario@pc MINGW32 /c/Tatoeba/RyckRichards/Tatoeba/tatoeba2 (issue-1112) | |
$ git log -2 | |
commit 92297157fbfebbcb86e279e89468602181728960 | |
Merge: b424352 67070f7 | |
Author: Trang <tranglich@gmail.com> | |
Date: Sun May 1 13:54:21 2016 +0200 | |
Merge pull request #1124 from ventice/issue-1050 | |
Escaped slashes in sphinx query and removed some code duplication |
Usuario@pc MINGW32 /c/Tatoeba/RyckRichards/Tatoeba/tatoeba2 (dev) | |
$ git checkout issue-1112 | |
Switched to branch 'issue-1112' | |
Usuario@pc MINGW32 /c/Tatoeba/RyckRichards/Tatoeba/tatoeba2 (issue-1112) | |
$ git rebase dev | |
First, rewinding head to replay your work on top of it... | |
Applying: #1112 Added language Chinese (Gan) | |
Using index info to reconstruct a base tree... | |
M app/vendors/languages_lib.php |
Usuario@pc MINGW32 /c/Tatoeba/RyckRichards/Tatoeba/tatoeba2 (issue-1112) | |
$ git checkout issue-1111 | |
Switched to branch 'issue-1111' | |
Your branch is up-to-date with 'origin/issue-1111'. | |
Usuario@pc MINGW32 /c/Tatoeba/RyckRichards/Tatoeba/tatoeba2 (issue-1111) | |
$ git rebase f5d966e7eb0b34fcdd85aecaec82a46a39a03ce9 | |
Current branch issue-1111 is up to date. | |
Usuario@pc MINGW32 /c/Tatoeba/RyckRichards/Tatoeba/tatoeba2 (issue-1111) |