Created
October 29, 2012 22:04
-
-
Save rdpanek/3976847 to your computer and use it in GitHub Desktop.
git skoleni bash history
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| rdpanek:temp radimdanielpanek$ lpwd | |
| -bash: lpwd: command not found | |
| rdpanek:temp radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp | |
| rdpanek:temp radimdanielpanek$ mkdir Eshop | |
| rdpanek:temp radimdanielpanek$ cd Eshop | |
| rdpanek:Eshop radimdanielpanek$ git init | |
| Initialized empty Git repository in /Volumes/HTDOCS/temp/Eshop/.git/ | |
| rdpanek:Eshop radimdanielpanek$ touch readme | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "readme" | |
| [master (root-commit) 0b1ec2d] readme | |
| 0 files changed | |
| create mode 100644 readme | |
| rdpanek:Eshop radimdanielpanek$ touch kosik | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "kosik" | |
| [master 60a7bbb] kosik | |
| 0 files changed | |
| create mode 100644 kosik | |
| rdpanek:Eshop radimdanielpanek$ gitk | |
| 2012-10-29 09:40:23.056 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:23.060 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:23.087 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:23.088 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:23.204 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:23.205 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:27.426 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:27.427 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:27.904 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 09:40:27.905 Wish[29273:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ cd ../ | |
| rdpanek:temp radimdanielpanek$ rm -rf Eshop | |
| rdpanek:temp radimdanielpanek$ git init | |
| Initialized empty Git repository in /Volumes/HTDOCS/temp/.git/ | |
| rdpanek:temp radimdanielpanek$ ls -la | |
| total 16 | |
| drwxrwxrwx 7 radimdanielpanek staff 238 29 říj 09:44 . | |
| drwxr-xr-x@ 44 radimdanielpanek staff 1564 24 říj 11:12 .. | |
| -rw-r--r--@ 1 radimdanielpanek staff 6148 5 říj 10:59 .DS_Store | |
| drwxr-xr-x 10 radimdanielpanek staff 340 29 říj 09:44 .git | |
| drwxr-xr-x 6 radimdanielpanek staff 204 27 říj 13:51 Eshop2 | |
| drwxrwxrwx 6 radimdanielpanek staff 204 26 říj 14:29 side | |
| drwxr-xr-x 8 radimdanielpanek staff 272 18 říj 23:46 test | |
| rdpanek:temp radimdanielpanek$ rm -rf .git/ | |
| rdpanek:temp radimdanielpanek$ mkdir Eshop | |
| rdpanek:temp radimdanielpanek$ cd Eshop | |
| rdpanek:Eshop radimdanielpanek$ git init | |
| Initialized empty Git repository in /Volumes/HTDOCS/temp/Eshop/.git/ | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 0 | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 09:44 . | |
| drwxrwxrwx 7 radimdanielpanek staff 238 29 říj 09:44 .. | |
| drwxr-xr-x 10 radimdanielpanek staff 340 29 říj 09:44 .git | |
| rdpanek:Eshop radimdanielpanek$ vim .git/config | |
| rdpanek:Eshop radimdanielpanek$ git config | |
| usage: git config [options] | |
| Config file location | |
| --global use global config file | |
| --system use system config file | |
| --local use repository config file | |
| -f, --file <file> use given config file | |
| Action | |
| --get get value: name [value-regex] | |
| --get-all get all values: key [value-regex] | |
| --get-regexp get values for regexp: name-regex [value-regex] | |
| --replace-all replace all matching variables: name value [value_regex] | |
| --add adds a new variable: name value | |
| --unset removes a variable: name [value-regex] | |
| --unset-all removes all matches: name [value-regex] | |
| --rename-section rename section: old-name new-name | |
| --remove-section remove a section: name | |
| -l, --list list all | |
| -e, --edit opens an editor | |
| --get-color <slot> find the color configured: [default] | |
| --get-colorbool <slot> | |
| find the color setting: [stdout-is-tty] | |
| Type | |
| --bool value is "true" or "false" | |
| --int value is decimal number | |
| --bool-or-int value is --bool or --int | |
| --path value is a path (file or directory name) | |
| Other | |
| -z, --null terminate values with NUL byte | |
| --includes respect include directives on lookup | |
| rdpanek:Eshop radimdanielpanek$ vim /Users/radimdanielpanek/.git | |
| .gitconfig .gitignore_global .gitk | |
| rdpanek:Eshop radimdanielpanek$ vim /Users/radimdanielpanek/.gitconfig | |
| rdpanek:Eshop radimdanielpanek$ vim .git/config | |
| rdpanek:Eshop radimdanielpanek$ git config --global user.name="Dan" | |
| error: invalid key: user.name=Dan | |
| rdpanek:Eshop radimdanielpanek$ git config | |
| usage: git config [options] | |
| Config file location | |
| --global use global config file | |
| --system use system config file | |
| --local use repository config file | |
| -f, --file <file> use given config file | |
| Action | |
| --get get value: name [value-regex] | |
| --get-all get all values: key [value-regex] | |
| --get-regexp get values for regexp: name-regex [value-regex] | |
| --replace-all replace all matching variables: name value [value_regex] | |
| --add adds a new variable: name value | |
| --unset removes a variable: name [value-regex] | |
| --unset-all removes all matches: name [value-regex] | |
| --rename-section rename section: old-name new-name | |
| --remove-section remove a section: name | |
| -l, --list list all | |
| -e, --edit opens an editor | |
| --get-color <slot> find the color configured: [default] | |
| --get-colorbool <slot> | |
| find the color setting: [stdout-is-tty] | |
| Type | |
| --bool value is "true" or "false" | |
| --int value is decimal number | |
| --bool-or-int value is --bool or --int | |
| --path value is a path (file or directory name) | |
| Other | |
| -z, --null terminate values with NUL byte | |
| --includes respect include directives on lookup | |
| rdpanek:Eshop radimdanielpanek$ vim /Users/radimdanielpanek/.gitconfig | |
| rdpanek:Eshop radimdanielpanek$ git config --global user.name="Dan" | |
| error: invalid key: user.name=Dan | |
| rdpanek:Eshop radimdanielpanek$ vim /Users/radimdanielpanek/.gitconfig | |
| rdpanek:Eshop radimdanielpanek$ git config --global user.name "Dan" | |
| rdpanek:Eshop radimdanielpanek$ git config --global user.name = "Dan" | |
| rdpanek:Eshop radimdanielpanek$ vim /Users/radimdanielpanek/.git | |
| .gitconfig .gitignore_global .gitk | |
| rdpanek:Eshop radimdanielpanek$ vim /Users/radimdanielpanek/.git | |
| .gitconfig .gitignore_global .gitk | |
| rdpanek:Eshop radimdanielpanek$ vim /Users/radimdanielpanek/.gitconfig | |
| rdpanek:Eshop radimdanielpanek$ git config --global user.name Dan | |
| rdpanek:Eshop radimdanielpanek$ vim /Users/radimdanielpanek/.gitconfig | |
| rdpanek:Eshop radimdanielpanek$ git config --global user.email [email protected] | |
| rdpanek:Eshop radimdanielpanek$ git config --list | |
| user.name=Dan | |
| [email protected] | |
| color.branch=auto | |
| color.diff=auto | |
| color.status=auto | |
| color.branch.current=yellow reverse | |
| color.branch.local=yellow | |
| color.branch.remote=green | |
| color.diff.meta=yellow bold | |
| color.diff.frag=magenta bold | |
| color.diff.old=red bold | |
| color.diff.new=green bold | |
| color.status.added=yellow | |
| color.status.changed=green | |
| color.status.untracked=cyan | |
| core.excludesfile=/Users/radimdanielpanek/.gitignore_global | |
| difftool.sourcetree.cmd=opendiff "$LOCAL" "$REMOTE" | |
| difftool.sourcetree.path= | |
| mergetool.sourcetree.cmd=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED" | |
| mergetool.sourcetree.trustexitcode=true | |
| alias.c=commit | |
| alias.l=log --pretty=format:'%h, %s, %an' --graph --color | |
| alias.s=status | |
| core.repositoryformatversion=0 | |
| core.filemode=true | |
| core.bare=false | |
| core.logallrefupdates=true | |
| core.ignorecase=true | |
| rdpanek:Eshop radimdanielpanek$ touch readme | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ touch readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # | |
| # Initial commit | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # readme | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git config --global user.email [email protected] | |
| rdpanek:Eshop radimdanielpanek$ git config --list | |
| user.name=Dan | |
| [email protected] | |
| color.branch=auto | |
| color.diff=auto | |
| color.status=auto | |
| color.branch.current=yellow reverse | |
| color.branch.local=yellow | |
| color.branch.remote=green | |
| color.diff.meta=yellow bold | |
| color.diff.frag=magenta bold | |
| color.diff.old=red bold | |
| color.diff.new=green bold | |
| color.status.added=yellow | |
| color.status.changed=green | |
| color.status.untracked=cyan | |
| core.excludesfile=/Users/radimdanielpanek/.gitignore_global | |
| difftool.sourcetree.cmd=opendiff "$LOCAL" "$REMOTE" | |
| difftool.sourcetree.path= | |
| mergetool.sourcetree.cmd=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED" | |
| mergetool.sourcetree.trustexitcode=true | |
| alias.c=commit | |
| alias.l=log --pretty=format:'%h, %s, %an' --graph --color | |
| alias.s=status | |
| core.repositoryformatversion=0 | |
| core.filemode=true | |
| core.bare=false | |
| core.logallrefupdates=true | |
| core.ignorecase=true | |
| rdpanek:Eshop radimdanielpanek$ git config --list | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # | |
| # Initial commit | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # readme | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git add readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # | |
| # Initial commit | |
| # | |
| # Changes to be committed: | |
| # (use "git rm --cached <file>..." to unstage) | |
| # | |
| # new file: readme | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit | |
| [master (root-commit) 9d68979] test | |
| 0 files changed | |
| create mode 100644 readme | |
| rdpanek:Eshop radimdanielpanek$ git show 9d6897 | |
| commit 9d689794d55826c05745fb5cf79c81dc18ce29bf | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 09:59:18 2012 +0100 | |
| test | |
| diff --git a/readme b/readme | |
| new file mode 100644 | |
| index 0000000..e69de29 | |
| rdpanek:Eshop radimdanielpanek$ vim | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 0 | |
| drwxr-xr-x 4 radimdanielpanek staff 136 29 říj 09:52 . | |
| drwxrwxrwx 7 radimdanielpanek staff 238 29 říj 09:44 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:00 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 0 29 říj 09:52 readme | |
| rdpanek:Eshop radimdanielpanek$ vim readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: readme | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: readme | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "test 2" | |
| [master 74de93a] test 2 | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ vim readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ vim readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: readme | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: readme | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: readme | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git reset HEAD readme | |
| Unstaged changes after reset: | |
| M readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: readme | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git checkout -- readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ cd ../ | |
| rdpanek:temp radimdanielpanek$ git clone https://github.com/DeveloperHub/PHPTestCase.git | |
| Cloning into 'PHPTestCase'... | |
| remote: Counting objects: 569, done. | |
| remote: Compressing objects: 100% (276/276), done. | |
| remote: Total 569 (delta 279), reused 561 (delta 271) | |
| Receiving objects: 100% (569/569), 596.99 KiB | 372 KiB/s, done. | |
| Resolving deltas: 100% (279/279), done. | |
| rdpanek:temp radimdanielpanek$ cd PHPTestCase/ | |
| rdpanek:PHPTestCase radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:PHPTestCase radimdanielpanek$ git log | |
| commit f31a2fafe387292feee1259c35f04268c1e4ffb9 | |
| Author: Radim Daniel Panek <[email protected]> | |
| Date: Fri Aug 3 13:40:17 2012 +0200 | |
| added: composer support, added composer.json | |
| commit 94e228b72cc759e7d35bf1b968ba2de7fd6d6929 | |
| Author: Ondřej Klejch <[email protected]> | |
| Date: Fri Aug 31 10:00:22 2012 +0200 | |
| added: MongoCursor marked as uncloneable object | |
| commit 432258b0e1cdd181a961f587674eaf106703559a | |
| Author: Radim Daniel Panek <[email protected]> | |
| Date: Fri Aug 3 13:40:17 2012 +0200 | |
| added: composer support, added composer.json | |
| commit b9f699c6bcf01884432a7fcd803a37b9df2d79d8 | |
| Author: Radim Daniel Panek <[email protected]> | |
| Date: Tue Jul 24 12:51:13 2012 +0200 | |
| phpunit.xml: changed: added strict and verbose attribute | |
| commit 62cffa2e0efe1df1d323098ec13bb42f8be042d2 | |
| Merge: 751fbe1 eef413b | |
| Author: Radim Daniel <[email protected]> | |
| Date: Tue Jul 17 02:28:07 2012 -0700 | |
| Merge pull request #1 from DeveloperHub/includepath_bugfix | |
| PHPUnit dir names fixed | |
| commit 751fbe1e2a3389d09b586b69b37b3d66f6fa8cfb | |
| Author: Radim Daniel Panek <[email protected]> | |
| Date: Tue Jul 3 12:54:32 2012 +0200 | |
| selenium support: upgrade: webdriver & example test | |
| commit 041cc0564b2e5a3d0762253f4d9af5c7c4ef28d7 | |
| Author: Radim Daniel Panek <[email protected]> | |
| rdpanek:PHPTestCase radimdanielpanek$ cd ../ | |
| rdpanek:temp radimdanielpanek$ cd Eshop | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ mkdir temp | |
| rdpanek:Eshop radimdanielpanek$ touch temp/latte.html | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # .gitignore | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # .gitignore | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # .gitignore | |
| # temp/ | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # .gitignore | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git add .gitignore | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ git add .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: .gitignore | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m ".gitignore added" | |
| [master 96bd79d] .gitignore added | |
| 1 file changed, 1 insertion(+) | |
| create mode 100644 .gitignore | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ vim readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: readme | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git commit -ma "redme" | |
| error: pathspec 'redme' did not match any file(s) known to git. | |
| rdpanek:Eshop radimdanielpanek$ git commit -ma "redme" | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: readme | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add -a -m "readme" | |
| error: unknown switch `a' | |
| usage: git add [options] [--] <filepattern>... | |
| -n, --dry-run dry run | |
| -v, --verbose be verbose | |
| -i, --interactive interactive picking | |
| -p, --patch select hunks interactively | |
| -e, --edit edit current diff and apply | |
| -f, --force allow adding otherwise ignored files | |
| -u, --update update tracked files | |
| -N, --intent-to-add record only the fact that the path will be added later | |
| -A, --all add changes from all tracked and untracked files | |
| --refresh don't add, only refresh the index | |
| --ignore-errors just skip files which cannot be added because of errors | |
| --ignore-missing check if - even missing - files are ignored in dry run | |
| rdpanek:Eshop radimdanielpanek$ git commit -a -m "readme" | |
| [master 287a065] readme | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ mkdir temp2 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -p master^{tree} | |
| 100644 blob d717ce2efe6c01f286fb79dabc3b6ecef3101d44 .gitignore | |
| 100644 blob 7285370e08b2feeeb28bccff897b7698c6daec38 readme | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 7 radimdanielpanek staff 238 29 říj 10:20 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:20 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 24 29 říj 10:18 readme | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxr-xr-x 2 radimdanielpanek staff 68 29 říj 10:20 temp2 | |
| rdpanek:Eshop radimdanielpanek$ touch temp2/smarty.php | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # temp2/ | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git commit -m -a "smarty" | |
| error: pathspec 'smarty' did not match any file(s) known to git. | |
| rdpanek:Eshop radimdanielpanek$ git commit -a -m "smarty" | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # temp2/ | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git add temp2/ | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: temp2/smarty.php | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "smarty" | |
| [master 214e4f6] smarty | |
| 0 files changed | |
| create mode 100644 temp2/smarty.php | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -p master^{tree} | |
| 100644 blob d717ce2efe6c01f286fb79dabc3b6ecef3101d44 .gitignore | |
| 100644 blob 7285370e08b2feeeb28bccff897b7698c6daec38 readme | |
| 040000 tree 4456d4f6a4bf5b7b80215e81f9149a15451aa000 temp2 | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -p 4456d4f6a4bf5b7b80215e81f9149a15451aa000 | |
| 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 smarty.php | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -p e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 7 radimdanielpanek staff 238 29 říj 10:20 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:23 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 24 29 říj 10:18 readme | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 10:21 temp2 | |
| rdpanek:Eshop radimdanielpanek$ chmod 777 -R * | |
| chmod: -R: No such file or directory | |
| rdpanek:Eshop radimdanielpanek$ chmod 777 * | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: readme | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git checkout -- readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 7 radimdanielpanek staff 238 29 říj 10:24 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:24 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 24 29 říj 10:24 readme | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:21 temp2 | |
| rdpanek:Eshop radimdanielpanek$ vim readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: readme | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git commit -a -m "redme" | |
| [master 975af7a] redme | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 7 radimdanielpanek staff 238 29 říj 10:24 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:25 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 37 29 říj 10:24 readme | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:21 temp2 | |
| rdpanek:Eshop radimdanielpanek$ mkdir temp3 | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 8 radimdanielpanek staff 272 29 říj 10:26 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:25 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 37 29 říj 10:24 readme | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:21 temp2 | |
| drwxr-xr-x 2 radimdanielpanek staff 68 29 říj 10:26 temp3 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ chmod 777 temp3 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 8 radimdanielpanek staff 272 29 říj 10:26 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:26 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 37 29 říj 10:24 readme | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:21 temp2 | |
| drwxrwxrwx 2 radimdanielpanek staff 68 29 říj 10:26 temp3 | |
| rdpanek:Eshop radimdanielpanek$ mkdir temp4 | |
| rdpanek:Eshop radimdanielpanek$ touch temp4/zend.php | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # temp4/ | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git add temp4 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: temp4/zend.php | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "Zend" | |
| [master 4af292d] Zend | |
| 0 files changed | |
| create mode 100644 temp4/zend.php | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 9 radimdanielpanek staff 306 29 říj 10:26 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:27 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 37 29 říj 10:24 readme | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:21 temp2 | |
| drwxrwxrwx 2 radimdanielpanek staff 68 29 říj 10:26 temp3 | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 10:26 temp4 | |
| rdpanek:Eshop radimdanielpanek$ chmod 777 temp4 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ cd temp4/ | |
| rdpanek:temp4 radimdanielpanek$ ls -la | |
| total 0 | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:26 . | |
| drwxr-xr-x 9 radimdanielpanek staff 306 29 říj 10:26 .. | |
| -rw-r--r-- 1 radimdanielpanek staff 0 29 říj 10:26 zend.php | |
| rdpanek:temp4 radimdanielpanek$ chmod 777 zend.php | |
| rdpanek:temp4 radimdanielpanek$ git status | |
| # On branch master | |
| # 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: zend.php | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:temp4 radimdanielpanek$ git checkout -- zend.php | |
| rdpanek:temp4 radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:temp4 radimdanielpanek$ git add | |
| rdpanek:temp4 radimdanielpanek$ ls -la | |
| total 0 | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:28 . | |
| drwxr-xr-x 9 radimdanielpanek staff 306 29 říj 10:26 .. | |
| -rw-r--r-- 1 radimdanielpanek staff 0 29 říj 10:28 zend.php | |
| rdpanek:temp4 radimdanielpanek$ cd ../ | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 9 radimdanielpanek staff 306 29 říj 10:26 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 13 radimdanielpanek staff 442 29 říj 10:29 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 37 29 říj 10:24 readme | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:21 temp2 | |
| drwxrwxrwx 2 radimdanielpanek staff 68 29 říj 10:26 temp3 | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:28 temp4 | |
| rdpanek:Eshop radimdanielpanek$ mkdir temp5 | |
| rdpanek:Eshop radimdanielpanek$ touch temp5/test.php | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # temp5/ | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git add temp5/ | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: temp5/test.php | |
| # | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: temp5/test.php | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: temp5/test.php | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git comit | |
| git: 'comit' is not a git command. See 'git --help'. | |
| Did you mean this? | |
| commit | |
| rdpanek:Eshop radimdanielpanek$ git commit | |
| error: There was a problem with the editor 'vi'. | |
| Please supply the message using either -m or -F option. | |
| rdpanek:Eshop radimdanielpanek$ git rm readme | |
| rm 'readme' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # deleted: readme | |
| # new file: temp5/test.php | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git reset HEAD temp5/test.php | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # deleted: readme | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # temp5/ | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "readme: deleted" | |
| [master dd66953] readme: deleted | |
| 1 file changed, 3 deletions(-) | |
| delete mode 100644 readme | |
| rdpanek:Eshop radimdanielpanek$ ls | |
| temp temp2 temp3 temp4 temp5 | |
| rdpanek:Eshop radimdanielpanek$ git mv temp | |
| temp/ temp2/ temp3/ temp4/ temp5/ | |
| rdpanek:Eshop radimdanielpanek$ git mv temp2/smarty.php temp2/smarty_new.php | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # renamed: temp2/smarty.php -> temp2/smarty_new.php | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # temp5/ | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "smarty: renamed" | |
| [master dfdc8f7] smarty: renamed | |
| 1 file changed, 0 insertions(+), 0 deletions(-) | |
| rename temp2/{smarty.php => smarty_new.php} (100%) | |
| rdpanek:Eshop radimdanielpanek$ gitk | |
| 2012-10-29 10:43:26.640 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:26.644 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:26.670 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:26.671 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:26.775 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:26.776 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:35.276 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:35.277 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:35.767 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:35.817 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:40.589 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:42.266 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:43:43.129 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:44:00.571 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:44:01.347 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| 2012-10-29 10:44:02.042 Wish[63482:707] CFURLCopyResourcePropertyForKey failed because it was passed this URL which has no scheme: | |
| rdpanek:Eshop radimdanielpanek$ git log | |
| commit dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:42:05 2012 +0100 | |
| smarty: renamed | |
| commit dd6695307c3657cf03b1709897b72ef7dfaf7ea3 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:41:09 2012 +0100 | |
| readme: deleted | |
| commit 4af292d078b5a5c80c116cf49527403777f7e397 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:27:04 2012 +0100 | |
| Zend | |
| commit 975af7ae2e92bdf21bbc4af5327546e41116ffae | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:24:55 2012 +0100 | |
| redme | |
| commit 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:22:32 2012 +0100 | |
| smarty | |
| rdpanek:Eshop radimdanielpanek$ git log | |
| commit dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:42:05 2012 +0100 | |
| smarty: renamed | |
| commit dd6695307c3657cf03b1709897b72ef7dfaf7ea3 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:41:09 2012 +0100 | |
| readme: deleted | |
| commit 4af292d078b5a5c80c116cf49527403777f7e397 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:27:04 2012 +0100 | |
| Zend | |
| commit 975af7ae2e92bdf21bbc4af5327546e41116ffae | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:24:55 2012 +0100 | |
| redme | |
| commit 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:22:32 2012 +0100 | |
| smarty | |
| commit 287a065155707fcdf99472eb086d2d634e423112 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:19:48 2012 +0100 | |
| readme | |
| commit 96bd79dcec0c80f6eac400926656bb5334385fae | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:18:23 2012 +0100 | |
| .gitignore added | |
| commit 74de93ab7438d8c0589ee0305170261f4257f0c1 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:03:03 2012 +0100 | |
| test 2 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline | |
| rdpanek:Eshop radimdanielpanek$ git log | |
| commit dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:42:05 2012 +0100 | |
| smarty: renamed | |
| commit dd6695307c3657cf03b1709897b72ef7dfaf7ea3 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:41:09 2012 +0100 | |
| readme: deleted | |
| commit 4af292d078b5a5c80c116cf49527403777f7e397 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:27:04 2012 +0100 | |
| Zend | |
| commit 975af7ae2e92bdf21bbc4af5327546e41116ffae | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:24:55 2012 +0100 | |
| redme | |
| commit 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:22:32 2012 +0100 | |
| smarty | |
| commit 287a065155707fcdf99472eb086d2d634e423112 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:19:48 2012 +0100 | |
| readme | |
| commit 96bd79dcec0c80f6eac400926656bb5334385fae | |
| Author: Dan <[email protected]> | |
| rdpanek:Eshop radimdanielpanek$ git log | |
| commit dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:42:05 2012 +0100 | |
| smarty: renamed | |
| commit dd6695307c3657cf03b1709897b72ef7dfaf7ea3 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:41:09 2012 +0100 | |
| readme: deleted | |
| commit 4af292d078b5a5c80c116cf49527403777f7e397 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:27:04 2012 +0100 | |
| Zend | |
| commit 975af7ae2e92bdf21bbc4af5327546e41116ffae | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:24:55 2012 +0100 | |
| redme | |
| commit 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:22:32 2012 +0100 | |
| smarty | |
| rdpanek:Eshop radimdanielpanek$ git mv temp2/smarty.php temp2/smarty_new.php | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline | |
| dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 smarty: renamed | |
| dd6695307c3657cf03b1709897b72ef7dfaf7ea3 readme: deleted | |
| 4af292d078b5a5c80c116cf49527403777f7e397 Zend | |
| 975af7ae2e92bdf21bbc4af5327546e41116ffae redme | |
| 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 smarty | |
| 287a065155707fcdf99472eb086d2d634e423112 readme | |
| 96bd79dcec0c80f6eac400926656bb5334385fae .gitignore added | |
| 74de93ab7438d8c0589ee0305170261f4257f0c1 test 2 | |
| 9d689794d55826c05745fb5cf79c81dc18ce29bf test | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline -3 | |
| dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 smarty: renamed | |
| dd6695307c3657cf03b1709897b72ef7dfaf7ea3 readme: deleted | |
| 4af292d078b5a5c80c116cf49527403777f7e397 Zend | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline HEAD^ | |
| dd6695307c3657cf03b1709897b72ef7dfaf7ea3 readme: deleted | |
| 4af292d078b5a5c80c116cf49527403777f7e397 Zend | |
| 975af7ae2e92bdf21bbc4af5327546e41116ffae redme | |
| 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 smarty | |
| 287a065155707fcdf99472eb086d2d634e423112 readme | |
| 96bd79dcec0c80f6eac400926656bb5334385fae .gitignore added | |
| 74de93ab7438d8c0589ee0305170261f4257f0c1 test 2 | |
| 9d689794d55826c05745fb5cf79c81dc18ce29bf test | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline HEAD^2 | |
| fatal: ambiguous argument 'HEAD^2': unknown revision or path not in the working tree. | |
| Use '--' to separate paths from revisions | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline HEAD~3 | |
| 975af7ae2e92bdf21bbc4af5327546e41116ffae redme | |
| 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 smarty | |
| 287a065155707fcdf99472eb086d2d634e423112 readme | |
| 96bd79dcec0c80f6eac400926656bb5334385fae .gitignore added | |
| 74de93ab7438d8c0589ee0305170261f4257f0c1 test 2 | |
| 9d689794d55826c05745fb5cf79c81dc18ce29bf test | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph | |
| * dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 smarty: renamed | |
| * dd6695307c3657cf03b1709897b72ef7dfaf7ea3 readme: deleted | |
| * 4af292d078b5a5c80c116cf49527403777f7e397 Zend | |
| * 975af7ae2e92bdf21bbc4af5327546e41116ffae redme | |
| * 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 smarty | |
| * 287a065155707fcdf99472eb086d2d634e423112 readme | |
| * 96bd79dcec0c80f6eac400926656bb5334385fae .gitignore added | |
| * 74de93ab7438d8c0589ee0305170261f4257f0c1 test 2 | |
| * 9d689794d55826c05745fb5cf79c81dc18ce29bf test | |
| rdpanek:Eshop radimdanielpanek$ git log -2 | |
| commit dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:42:05 2012 +0100 | |
| smarty: renamed | |
| commit dd6695307c3657cf03b1709897b72ef7dfaf7ea3 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 10:41:09 2012 +0100 | |
| readme: deleted | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 8 | |
| drwxr-xr-x 9 radimdanielpanek staff 306 29 říj 10:40 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 14 radimdanielpanek staff 476 29 říj 10:43 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:16 .gitignore | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:41 temp2 | |
| drwxrwxrwx 2 radimdanielpanek staff 68 29 říj 10:26 temp3 | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:28 temp4 | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 10:29 temp5 | |
| rdpanek:Eshop radimdanielpanek$ git blame -L 0,4 .gitignore | |
| fatal: file .gitignore has only 1 lines | |
| rdpanek:Eshop radimdanielpanek$ git blame -L 0,1 .gitignore | |
| 96bd79dc (Dan 2012-10-29 10:18:23 +0100 1) temp/* | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "druhy" | |
| [master 7c85b95] druhy | |
| 1 file changed, 1 insertion(+) | |
| create mode 100644 temp5/test.php | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "treti" | |
| [master 82cb843] treti | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git blame -L 0,3 .gitignore | |
| 96bd79dc (Dan 2012-10-29 10:18:23 +0100 1) temp/* | |
| 7c85b95c (Dan 2012-10-29 10:47:36 +0100 2) druhy | |
| 82cb843b (Dan 2012-10-29 10:47:50 +0100 3) treti | |
| rdpanek:Eshop radimdanielpanek$ git blame -L 0,3 .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git blame -l 0,3 .gitignore | |
| fatal: bad revision '0,3' | |
| rdpanek:Eshop radimdanielpanek$ git blame -L 0,3 .gitignore | |
| 96bd79dc (Dan 2012-10-29 10:18:23 +0100 1) temp/* | |
| 7c85b95c (Dan 2012-10-29 10:47:36 +0100 2) druhy | |
| 82cb843b (Dan 2012-10-29 10:47:50 +0100 3) treti | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 8 | |
| drwxr-xr-x 9 radimdanielpanek staff 306 29 říj 10:47 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 14 radimdanielpanek staff 476 29 říj 10:50 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 19 29 říj 10:47 .gitignore | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:41 temp2 | |
| drwxrwxrwx 2 radimdanielpanek staff 68 29 říj 10:26 temp3 | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:28 temp4 | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 10:29 temp5 | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: .gitignore | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: .gitignore | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit --amend | |
| [master 75c5ee9] odstraneni | |
| 1 file changed, 1 deletion(-) | |
| rdpanek:Eshop radimdanielpanek$ git commit --amend | |
| [master 1c85cae] odstraneni2 | |
| 1 file changed, 1 deletion(-) | |
| rdpanek:Eshop radimdanielpanek$ git commit --amned --author "RDPanek <[email protected]> | |
| > " | |
| error: unknown option `amned' | |
| usage: git commit [options] [--] <filepattern>... | |
| -q, --quiet suppress summary after successful commit | |
| -v, --verbose show diff in commit message template | |
| Commit message options | |
| -F, --file <file> read message from file | |
| --author <author> override author for commit | |
| --date <date> override date for commit | |
| -m, --message <message> | |
| commit message | |
| -c, --reedit-message <commit> | |
| reuse and edit message from specified commit | |
| -C, --reuse-message <commit> | |
| reuse message from specified commit | |
| --fixup <commit> use autosquash formatted message to fixup specified commit | |
| --squash <commit> use autosquash formatted message to squash specified commit | |
| --reset-author the commit is authored by me now (used with -C/-c/--amend) | |
| -s, --signoff add Signed-off-by: | |
| -t, --template <file> | |
| use specified template file | |
| -e, --edit force edit of commit | |
| --cleanup <default> how to strip spaces and #comments from message | |
| --status include status in commit message template | |
| -S, --gpg-sign[=<key id>] | |
| GPG sign commit | |
| Commit contents options | |
| -a, --all commit all changed files | |
| -i, --include add specified files to index for commit | |
| --interactive interactively add files | |
| -p, --patch interactively add changes | |
| -o, --only commit only specified files | |
| -n, --no-verify bypass pre-commit hook | |
| --dry-run show what would be committed | |
| --short show status concisely | |
| --branch show branch information | |
| --porcelain machine-readable output | |
| -z, --null terminate entries with NUL | |
| --amend amend previous commit | |
| --no-post-rewrite bypass post-rewrite hook | |
| -u, --untracked-files[=<mode>] | |
| show untracked files, optional modes: all, normal, no. (Default: all) | |
| rdpanek:Eshop radimdanielpanek$ git commit --amned --author"RDPanek <[email protected]> | |
| " | |
| error: unknown option `amned' | |
| usage: git commit [options] [--] <filepattern>... | |
| -q, --quiet suppress summary after successful commit | |
| -v, --verbose show diff in commit message template | |
| Commit message options | |
| -F, --file <file> read message from file | |
| --author <author> override author for commit | |
| --date <date> override date for commit | |
| -m, --message <message> | |
| commit message | |
| -c, --reedit-message <commit> | |
| reuse and edit message from specified commit | |
| -C, --reuse-message <commit> | |
| reuse message from specified commit | |
| --fixup <commit> use autosquash formatted message to fixup specified commit | |
| --squash <commit> use autosquash formatted message to squash specified commit | |
| --reset-author the commit is authored by me now (used with -C/-c/--amend) | |
| -s, --signoff add Signed-off-by: | |
| -t, --template <file> | |
| use specified template file | |
| -e, --edit force edit of commit | |
| --cleanup <default> how to strip spaces and #comments from message | |
| --status include status in commit message template | |
| -S, --gpg-sign[=<key id>] | |
| GPG sign commit | |
| Commit contents options | |
| -a, --all commit all changed files | |
| -i, --include add specified files to index for commit | |
| --interactive interactively add files | |
| -p, --patch interactively add changes | |
| -o, --only commit only specified files | |
| -n, --no-verify bypass pre-commit hook | |
| --dry-run show what would be committed | |
| --short show status concisely | |
| --branch show branch information | |
| --porcelain machine-readable output | |
| -z, --null terminate entries with NUL | |
| --amend amend previous commit | |
| --no-post-rewrite bypass post-rewrite hook | |
| -u, --untracked-files[=<mode>] | |
| show untracked files, optional modes: all, normal, no. (Default: all) | |
| rdpanek:Eshop radimdanielpanek$ git commit --amend --author "RDPanek <[email protected]> | |
| " | |
| [master a2a9fce] Zmena autora | |
| Author: RDPanek <[email protected]> | |
| 1 file changed, 1 deletion(-) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ touch kosik | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # kosik | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ ls | |
| kosik temp temp2 temp3 temp4 temp5 | |
| rdpanek:Eshop radimdanielpanek$ vim readme | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # kosik | |
| # readme | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ vim | |
| .git/ kosik temp/ temp3/ temp5/ | |
| .gitignore readme temp2/ temp4/ | |
| rdpanek:Eshop radimdanielpanek$ vim temp | |
| temp/ temp2/ temp3/ temp4/ temp5/ | |
| rdpanek:Eshop radimdanielpanek$ vim temp | |
| temp/ temp2/ temp3/ temp4/ temp5/ | |
| rdpanek:Eshop radimdanielpanek$ vim temp2/smarty_new.php | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: temp2/smarty_new.php | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # kosik | |
| # readme | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git reset --hard HEAD | |
| HEAD is now at a2a9fce Zmena autora | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # kosik | |
| # readme | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # kosik | |
| # readme | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ vim temp2/smarty_new.php | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: temp2/smarty_new.php | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # kosik | |
| # readme | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git checkout -- temp2/smarty_new.php | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # kosik | |
| # readme | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b develop | |
| Switched to a new branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ touch zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add zbozi | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zbozi" | |
| [develop 0627ef0] zbozi | |
| 0 files changed | |
| create mode 100644 zbozi | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph --branches | |
| * 0627ef0d100603a6531dab36a913404855591806 zbozi | |
| * a2a9fce477a7f75514c1dcd84f50314d6d8171ff Zmena autora | |
| * 7c85b95c8444c1cd7c0f25dfcc5fc7ea93437a63 druhy | |
| * dfdc8f7b1c0f4ea33ec0b0134626d4a21d08dc14 smarty: renamed | |
| * dd6695307c3657cf03b1709897b72ef7dfaf7ea3 readme: deleted | |
| * 4af292d078b5a5c80c116cf49527403777f7e397 Zend | |
| * 975af7ae2e92bdf21bbc4af5327546e41116ffae redme | |
| * 214e4f6ea1975e8b5e1cab243f416d0b2f4ad370 smarty | |
| * 287a065155707fcdf99472eb086d2d634e423112 readme | |
| * 96bd79dcec0c80f6eac400926656bb5334385fae .gitignore added | |
| * 74de93ab7438d8c0589ee0305170261f4257f0c1 test 2 | |
| * 9d689794d55826c05745fb5cf79c81dc18ce29bf test | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitignore | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitignore | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ gitk.cache info/ refs/ | |
| HEAD config hooks/ logs/ | |
| ORIG_HEAD description index objects/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ gitk.cache info/ refs/ | |
| HEAD config hooks/ logs/ | |
| ORIG_HEAD description index objects/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/ | |
| heads/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/heads/ | |
| develop master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/heads/develop | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/heads/master | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitignore | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitignore | |
| rdpanek:Eshop radimdanielpanek$ vim .git/HEAD | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b fix | |
| Switched to a new branch 'fix' | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/ | |
| heads/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/heads/ | |
| develop fix master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/heads/fix | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * fix | |
| master | |
| rdpanek:Eshop radimdanielpanek$ touch oprava_kosiku | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch fix | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # kosik | |
| # oprava_kosiku | |
| # readme | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "Repair basket" | |
| [fix 8fd611d] Repair basket | |
| 1 file changed, 1 insertion(+) | |
| create mode 100644 kosik | |
| create mode 100644 oprava_kosiku | |
| create mode 100644 readme | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 8 | |
| drwxr-xr-x 10 radimdanielpanek staff 340 29 říj 11:28 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 15 radimdanielpanek staff 510 29 říj 11:28 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 7 29 říj 10:51 .gitignore | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:58 temp2 | |
| drwxrwxrwx 2 radimdanielpanek staff 68 29 říj 10:26 temp3 | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:28 temp4 | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 10:29 temp5 | |
| -rw-r--r-- 1 radimdanielpanek staff 0 29 říj 11:05 zbozi | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git commit -a -m "added zbozi" | |
| [develop 1d28c1a] added zbozi | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| fix | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git branch -d fix | |
| error: The branch 'fix' is not fully merged. | |
| If you are sure you want to delete it, run 'git branch -D fix'. | |
| rdpanek:Eshop radimdanielpanek$ git branch -D fix | |
| Deleted branch fix (was 8fd611d). | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ vim | |
| .git/ temp/ temp3/ temp5/ | |
| .gitignore temp2/ temp4/ zbozi | |
| rdpanek:Eshop radimdanielpanek$ vim | |
| .git/ temp/ temp3/ temp5/ | |
| .gitignore temp2/ temp4/ zbozi | |
| rdpanek:Eshop radimdanielpanek$ vim .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| # 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: .gitignore | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| M .gitignore | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # 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: .gitignore | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git add .gitignore | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: .gitignore | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| M .gitignore | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: .gitignore | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m ".added .gitignore" | |
| [develop 310514d] .added .gitignore | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ touch reklamace | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "reklamace" | |
| [master 9bf65f1] reklamace | |
| 0 files changed | |
| create mode 100644 reklamace | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git merge develop | |
| Merge made by the 'recursive' strategy. | |
| .gitignore | 1 + | |
| zbozi | 1 + | |
| 2 files changed, 2 insertions(+) | |
| create mode 100644 zbozi | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git merge master | |
| Updating 310514d..ac35207 | |
| Fast-forward | |
| 0 files changed | |
| create mode 100644 reklamace | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 11 radimdanielpanek staff 374 29 říj 11:55 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 10:12 .. | |
| drwxr-xr-x 15 radimdanielpanek staff 510 29 říj 11:59 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 13 29 říj 11:47 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 0 29 říj 11:55 reklamace | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:14 temp | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:58 temp2 | |
| drwxrwxrwx 2 radimdanielpanek staff 68 29 říj 10:26 temp3 | |
| drwxrwxrwx 3 radimdanielpanek staff 102 29 říj 10:28 temp4 | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 10:29 temp5 | |
| -rw-r--r-- 1 radimdanielpanek staff 12 29 říj 11:47 zbozi | |
| rdpanek:Eshop radimdanielpanek$ touch pokladna | |
| rdpanek:Eshop radimdanielpanek$ git add pokladna | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "pokladna" | |
| [develop c2d2b85] pokladna | |
| 0 files changed | |
| create mode 100644 pokladna | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ touch kategorie | |
| rdpanek:Eshop radimdanielpanek$ git add kategorie | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "kategorie" | |
| [master 3ea8fb2] kategorie | |
| 0 files changed | |
| create mode 100644 kategorie | |
| rdpanek:Eshop radimdanielpanek$ touch vyhledavani | |
| rdpanek:Eshop radimdanielpanek$ git add vyhledavani | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "vyhledavani" | |
| [master 4b5d6d0] vyhledavani | |
| 0 files changed | |
| create mode 100644 vyhledavani | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ ls | |
| pokladna temp temp3 temp5 | |
| reklamace temp2 temp4 zbozi | |
| rdpanek:Eshop radimdanielpanek$ git touch ceny | |
| git: 'touch' is not a git command. See 'git --help'. | |
| rdpanek:Eshop radimdanielpanek$ touch ceny | |
| rdpanek:Eshop radimdanielpanek$ git add ceny | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "ceny" | |
| [develop bfb83d4] ceny | |
| 0 files changed | |
| create mode 100644 ceny | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git rebase master | |
| First, rewinding head to replay your work on top of it... | |
| Applying: pokladna | |
| Applying: ceny | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git merge master | |
| Already up-to-date. | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git merge develop | |
| Updating 4b5d6d0..fca35df | |
| Fast-forward | |
| 0 files changed | |
| create mode 100644 ceny | |
| create mode 100644 pokladna | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ vim | |
| .git/ kategorie temp/ temp4/ zbozi | |
| .gitignore pokladna temp2/ temp5/ | |
| ceny reklamace temp3/ vyhledavani | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add zbozi | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zbozi" | |
| [master ce645dc] zbozi | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add zbozi | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zbozi" | |
| [develop 876ec38] zbozi | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| rdpanek:Eshop radimdanielpanek$ git merge | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git merg master | |
| git: 'merg' is not a git command. See 'git --help'. | |
| Did you mean one of these? | |
| merge | |
| grep | |
| mktree | |
| rdpanek:Eshop radimdanielpanek$ git merge master | |
| Merge made by the 'recursive' strategy. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~3 | |
| The previous cherry-pick is now empty, possibly due to conflict resolution. | |
| If you wish to commit it anyway, use: | |
| git commit --allow-empty | |
| Otherwise, please use 'git reset' | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| Could not apply ce645dc... zbozi | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * (no branch) | |
| develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Previous HEAD position was 876ec38... zbozi | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~3 | |
| It seems that there is already a rebase-merge directory, and | |
| I wonder if you are in the middle of another rebase. If that is the | |
| case, please try | |
| git rebase (--continue | --abort | --skip) | |
| If that is not the case, please | |
| rm -fr /Volumes/HTDOCS/temp/Eshop/.git/rebase-merge | |
| and run me again. I am stopping in case you still have something | |
| valuable there. | |
| rdpanek:Eshop radimdanielpanek$ git rebase --abort | |
| rdpanek:Eshop radimdanielpanek$ git checkout fca35df5f264cc195e5c93b6fc85a10a2720fbab | |
| Note: checking out 'fca35df5f264cc195e5c93b6fc85a10a2720fbab'. | |
| You are in 'detached HEAD' state. You can look around, make experimental | |
| changes and commit them, and you can discard any commits you make in this | |
| state without impacting any branches by performing another checkout. | |
| If you want to create a new branch to retain commits you create, you may | |
| do so (now or later) by using -b with the checkout command again. Example: | |
| git checkout -b new_branch_name | |
| HEAD is now at fca35df... ceny | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b fix | |
| Switched to a new branch 'fix' | |
| rdpanek:Eshop radimdanielpanek$ vim | |
| .git/ kategorie temp/ temp4/ zbozi | |
| .gitignore pokladna temp2/ temp5/ | |
| ceny reklamace temp3/ vyhledavani | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zbozi" | |
| [fix 123b983] zbozi | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * fix | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git rebase master | |
| First, rewinding head to replay your work on top of it... | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch fix | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git merge master | |
| Already up-to-date. | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git merge master | |
| Already up-to-date. | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| fix | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkou -b fix2 | |
| git: 'checkou' is not a git command. See 'git --help'. | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b fix2 | |
| Switched to a new branch 'fix2' | |
| rdpanek:Eshop radimdanielpanek$ touch zbozi | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add zbozi | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zbozi" | |
| [fix2 de44a31] zbozi | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix | |
| * fix2 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add zbozi | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zbozi" | |
| [develop cd55e0e] zbozi | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| fix | |
| fix2 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout fix2 | |
| Switched to branch 'fix2' | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix | |
| * fix2 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git rebase develop | |
| First, rewinding head to replay your work on top of it... | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch fix2 | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix | |
| * fix2 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add zbozi | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zbozi" | |
| [fix2 86dfa5e] zbozi | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix | |
| * fix2 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout develpo | |
| error: pathspec 'develpo' did not match any file(s) known to git. | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop | |
| Switched to branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add zbozi | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zbozi" | |
| [develop 1613386] zbozi | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| fix | |
| fix2 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout fix2 | |
| Switched to branch 'fix2' | |
| rdpanek:Eshop radimdanielpanek$ git rebase develop | |
| First, rewinding head to replay your work on top of it... | |
| Applying: zbozi | |
| Using index info to reconstruct a base tree... | |
| Falling back to patching base and 3-way merge... | |
| Auto-merging zbozi | |
| CONFLICT (content): Merge conflict in zbozi | |
| Failed to merge in the changes. | |
| Patch failed at 0001 zbozi | |
| When you have resolved this problem run "git rebase --continue". | |
| If you would prefer to skip this patch, instead run "git rebase --skip". | |
| To check out the original branch and stop rebasing run "git rebase --abort". | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # Not currently on any branch. | |
| # Unmerged paths: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: zbozi | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * (no branch) | |
| develop | |
| fix | |
| fix2 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ vim zbozi | |
| rdpanek:Eshop radimdanielpanek$ git add zbozi | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # Not currently on any branch. | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: zbozi | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| Applying: zbozi | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix | |
| * fix2 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ cd ../ | |
| rdpanek:temp radimdanielpanek$ rm -rf Eshop | |
| rdpanek:temp radimdanielpanek$ git clone https://github.com/DeveloperHub/Eshop.git | |
| Cloning into 'Eshop'... | |
| remote: Counting objects: 3, done. | |
| remote: Total 3 (delta 0), reused 0 (delta 0) | |
| Unpacking objects: 100% (3/3), done. | |
| rdpanek:temp radimdanielpanek$ ls -la | |
| total 16 | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 13:46 . | |
| drwxr-xr-x@ 44 radimdanielpanek staff 1564 24 říj 11:12 .. | |
| -rw-r--r--@ 1 radimdanielpanek staff 6148 5 říj 10:59 .DS_Store | |
| drwxr-xr-x 4 radimdanielpanek staff 136 29 říj 13:46 Eshop | |
| drwxr-xr-x 6 radimdanielpanek staff 204 27 říj 13:51 Eshop2 | |
| drwxr-xr-x 8 radimdanielpanek staff 272 29 říj 10:12 PHPTestCase | |
| drwxrwxrwx 6 radimdanielpanek staff 204 26 říj 14:29 side | |
| drwxr-xr-x 8 radimdanielpanek staff 272 18 říj 23:46 test | |
| rdpanek:temp radimdanielpanek$ cd Eshop | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git git branch -a | |
| git: 'git' is not a git command. See 'git --help'. | |
| Did you mean this? | |
| init | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ git remote -v | |
| origin https://github.com/DeveloperHub/Eshop.git (fetch) | |
| origin https://github.com/DeveloperHub/Eshop.git (push) | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b develop | |
| Switched to a new branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ touch registrace | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "registrace" | |
| [develop 1828b14] registrace | |
| 0 files changed | |
| create mode 100644 registrace | |
| rdpanek:Eshop radimdanielpanek$ git push origin develop | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (2/2), done. | |
| Writing objects: 100% (3/3), 269 bytes, done. | |
| Total 3 (delta 0), reused 0 (delta 0) | |
| To https://github.com/DeveloperHub/Eshop.git | |
| * [new branch] develop -> develop | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b fix | |
| Switched to a new branch 'fix' | |
| rdpanek:Eshop radimdanielpanek$ touch fix | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "fix" | |
| [fix 5feb847] fix | |
| 0 files changed | |
| create mode 100644 fix | |
| rdpanek:Eshop radimdanielpanek$ git push origin fix | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (2/2), done. | |
| Writing objects: 100% (2/2), 264 bytes, done. | |
| Total 2 (delta 0), reused 0 (delta 0) | |
| To https://github.com/DeveloperHub/Eshop.git | |
| * [new branch] fix -> fix | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b test | |
| Switched to a new branch 'test' | |
| rdpanek:Eshop radimdanielpanek$ git push origin test23 | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| error: src refspec test23 does not match any. | |
| error: failed to push some refs to 'https://github.com/DeveloperHub/Eshop.git' | |
| rdpanek:Eshop radimdanielpanek$ git push origin test | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch test | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix | |
| master | |
| * test | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git branch -d test | |
| error: The branch 'test' is not fully merged. | |
| If you are sure you want to delete it, run 'git branch -D test'. | |
| rdpanek:Eshop radimdanielpanek$ git branch -D test | |
| Deleted branch test (was 5feb847). | |
| rdpanek:Eshop radimdanielpanek$ git branch -d fix | |
| error: The branch 'fix' is not fully merged. | |
| If you are sure you want to delete it, run 'git branch -D fix'. | |
| rdpanek:Eshop radimdanielpanek$ git branch -D fix | |
| Deleted branch fix (was 5feb847). | |
| rdpanek:Eshop radimdanielpanek$ git branch -d develop | |
| error: The branch 'develop' is not fully merged. | |
| If you are sure you want to delete it, run 'git branch -D develop'. | |
| rdpanek:Eshop radimdanielpanek$ git branch -D develop | |
| Deleted branch develop (was 1828b14). | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/develop | |
| remotes/origin/fix | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git checkout develop origin/develop | |
| error: pathspec 'develop' did not match any file(s) known to git. | |
| error: pathspec 'origin/develop' did not match any file(s) known to git. | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b develop origin/develop | |
| Branch develop set up to track remote branch develop from origin. | |
| Switched to a new branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * develop | |
| master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/develop | |
| remotes/origin/fix | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git branch -d develop | |
| warning: deleting branch 'develop' that has been merged to | |
| 'refs/remotes/origin/develop', but not yet merged to HEAD. | |
| Deleted branch develop (was 1828b14). | |
| rdpanek:Eshop radimdanielpanek$ git branch -D develop | |
| error: branch 'develop' not found. | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/develop | |
| remotes/origin/fix | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git checkout #US1234 | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b #US1234 | |
| error: switch `b' requires a value | |
| usage: git checkout [options] <branch> | |
| or: git checkout [options] [<branch>] -- <file>... | |
| -q, --quiet suppress progress reporting | |
| -b <branch> create and checkout a new branch | |
| -B <branch> create/reset and checkout a branch | |
| -l create reflog for new branch | |
| --detach detach the HEAD at named commit | |
| -t, --track set upstream info for new branch | |
| --orphan <new branch> | |
| new unparented branch | |
| -2, --ours checkout our version for unmerged files | |
| -3, --theirs checkout their version for unmerged files | |
| -f, --force force checkout (throw away local modifications) | |
| -m, --merge perform a 3-way merge with the new branch | |
| --overwrite-ignore update ignored files (default) | |
| --conflict <style> conflict style (merge or diff3) | |
| -p, --patch select hunks interactively | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b US1234 | |
| Switched to a new branch 'US1234' | |
| rdpanek:Eshop radimdanielpanek$ touch acl | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "acl" | |
| [US1234 bcc42b7] acl | |
| 0 files changed | |
| create mode 100644 acl | |
| rdpanek:Eshop radimdanielpanek$ git push origin US1234 | |
| Username for 'https://github.com': ^C | |
| rdpanek:Eshop radimdanielpanek$ git remote -v | |
| origin https://github.com/DeveloperHub/Eshop.git (fetch) | |
| origin https://github.com/DeveloperHub/Eshop.git (push) | |
| rdpanek:Eshop radimdanielpanek$ git push origin | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| Everything up-to-date | |
| rdpanek:Eshop radimdanielpanek$ git push origin US1234 | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (2/2), done. | |
| Writing objects: 100% (3/3), 257 bytes, done. | |
| Total 3 (delta 0), reused 0 (delta 0) | |
| To https://github.com/DeveloperHub/Eshop.git | |
| * [new branch] US1234 -> US1234 | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * US1234 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git branch -D US1234 | |
| Deleted branch US1234 (was bcc42b7). | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/fix | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b US1234 origin/US1234 | |
| Branch US1234 set up to track remote branch US1234 from origin. | |
| Switched to a new branch 'US1234' | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * US1234 | |
| master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/fix | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git fetch | |
| rdpanek:Eshop radimdanielpanek$ git fetch | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch US1234 | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git push origin :fix | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| To https://github.com/DeveloperHub/Eshop.git | |
| - [deleted] fix | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * US1234 | |
| master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ refs/ | |
| FETCH_HEAD config index objects/ | |
| HEAD description info/ packed-refs | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ refs/ | |
| FETCH_HEAD config index objects/ | |
| HEAD description info/ packed-refs | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/ | |
| heads/ remotes/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/heads/ | |
| US1234 master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/remotes/origin/ | |
| HEAD US1234 develop | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/remotes/origin/ | |
| HEAD US1234 develop | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/remotes/origin/ | |
| rdpanek:Eshop radimdanielpanek$ git reflog | |
| bcc42b7 HEAD@{0}: checkout: moving from master to US1234 | |
| 85f364c HEAD@{1}: checkout: moving from US1234 to master | |
| bcc42b7 HEAD@{2}: commit: acl | |
| 85f364c HEAD@{3}: checkout: moving from master to US1234 | |
| 85f364c HEAD@{4}: checkout: moving from develop to master | |
| 1828b14 HEAD@{5}: checkout: moving from master to develop | |
| 85f364c HEAD@{6}: checkout: moving from test to master | |
| 5feb847 HEAD@{7}: checkout: moving from fix to test | |
| 5feb847 HEAD@{8}: commit: fix | |
| 1828b14 HEAD@{9}: checkout: moving from develop to fix | |
| 1828b14 HEAD@{10}: commit: registrace | |
| 85f364c HEAD@{11}: checkout: moving from master to develop | |
| 85f364c HEAD@{12}: clone: from https://github.com/DeveloperHub/Eshop.git | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * US1234 | |
| master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/HEAD | |
| rdpanek:Eshop radimdanielpanek$ git push origin :fix | |
| rdpanek:Eshop radimdanielpanek$ git remote add phptestcase https://github.com/DeveloperHub/PHPTestCase.git | |
| rdpanek:Eshop radimdanielpanek$ git remote -v | |
| origin https://github.com/DeveloperHub/Eshop.git (fetch) | |
| origin https://github.com/DeveloperHub/Eshop.git (push) | |
| phptestcase https://github.com/DeveloperHub/PHPTestCase.git (fetch) | |
| phptestcase https://github.com/DeveloperHub/PHPTestCase.git (push) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * US1234 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| US1234 | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/ | |
| heads/ remotes/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/heads/ | |
| US1234 master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/heads/master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/HEAD | |
| rdpanek:Eshop radimdanielpanek$ git checkout US1234 | |
| Switched to branch 'US1234' | |
| rdpanek:Eshop radimdanielpanek$ vim .git/HEAD | |
| rdpanek:Eshop radimdanielpanek$ git checkout US1234 | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * US1234 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git remote -v | |
| origin https://github.com/DeveloperHub/Eshop.git (fetch) | |
| origin https://github.com/DeveloperHub/Eshop.git (push) | |
| phptestcase https://github.com/DeveloperHub/PHPTestCase.git (fetch) | |
| phptestcase https://github.com/DeveloperHub/PHPTestCase.git (push) | |
| rdpanek:Eshop radimdanielpanek$ git remote rm phptestcase | |
| rdpanek:Eshop radimdanielpanek$ git remote -v | |
| origin https://github.com/DeveloperHub/Eshop.git (fetch) | |
| origin https://github.com/DeveloperHub/Eshop.git (push) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * US1234 | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git branch -d US1234 | |
| warning: deleting branch 'US1234' that has been merged to | |
| 'refs/remotes/origin/US1234', but not yet merged to HEAD. | |
| Deleted branch US1234 (was bcc42b7). | |
| rdpanek:Eshop radimdanielpanek$ git branch -D US1234 | |
| error: branch 'US1234' not found. | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b develop | |
| Switched to a new branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ touch dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "dataprojektor" | |
| [develop 80ce5a6] dataprojektor | |
| 0 files changed | |
| create mode 100644 dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * develop | |
| master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git push origin :develop | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| To https://github.com/DeveloperHub/Eshop.git | |
| - [deleted] develop | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * develop | |
| master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git push origin develop | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (2/2), done. | |
| Writing objects: 100% (3/3), 274 bytes, done. | |
| Total 3 (delta 0), reused 0 (delta 0) | |
| To https://github.com/DeveloperHub/Eshop.git | |
| * [new branch] develop -> develop | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * develop | |
| master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ touch cocka | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "cocka" | |
| [develop df5b3f6] cocka | |
| 0 files changed | |
| create mode 100644 cocka | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git push | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (2/2), done. | |
| Writing objects: 100% (2/2), 270 bytes, done. | |
| Total 2 (delta 0), reused 0 (delta 0) | |
| To https://github.com/DeveloperHub/Eshop.git | |
| 80ce5a6..df5b3f6 develop -> develop | |
| rdpanek:Eshop radimdanielpanek$ git remote -v | |
| origin https://github.com/DeveloperHub/Eshop.git (fetch) | |
| origin https://github.com/DeveloperHub/Eshop.git (push) | |
| rdpanek:Eshop radimdanielpanek$ git remote add phptestcase https://github.com/DeveloperHub/PHPTestCase.git | |
| rdpanek:Eshop radimdanielpanek$ git remote -v | |
| origin https://github.com/DeveloperHub/Eshop.git (fetch) | |
| origin https://github.com/DeveloperHub/Eshop.git (push) | |
| phptestcase https://github.com/DeveloperHub/PHPTestCase.git (fetch) | |
| phptestcase https://github.com/DeveloperHub/PHPTestCase.git (push) | |
| rdpanek:Eshop radimdanielpanek$ git fetch phptestcase | |
| warning: no common commits | |
| remote: Counting objects: 569, done. | |
| remote: Compressing objects: 100% (276/276), done. | |
| remote: Total 569 (delta 279), reused 561 (delta 271) | |
| Receiving objects: 100% (569/569), 596.99 KiB | 324 KiB/s, done. | |
| Resolving deltas: 100% (279/279), done. | |
| From https://github.com/DeveloperHub/PHPTestCase | |
| * [new branch] composer -> phptestcase/composer | |
| * [new branch] develop -> phptestcase/develop | |
| * [new branch] gh-pages -> phptestcase/gh-pages | |
| * [new branch] master -> phptestcase/master | |
| * [new branch] smazat -> phptestcase/smazat | |
| From https://github.com/DeveloperHub/PHPTestCase | |
| * [new tag] v1.0.0 -> v1.0.0 | |
| * [new tag] v1.1.0 -> v1.1.0 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * develop | |
| master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| remotes/phptestcase/composer | |
| remotes/phptestcase/develop | |
| remotes/phptestcase/gh-pages | |
| remotes/phptestcase/master | |
| remotes/phptestcase/smazat | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b test | |
| Switched to a new branch 'test' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch test | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| * test | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b phptestcase/master | |
| Switched to a new branch 'phptestcase/master' | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| * phptestcase/master | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph -10 | |
| * df5b3f6d2124ddae3767f8342cc4695d4fc93c97 cocka | |
| * 80ce5a6645cca09f8d6ddfb69042ed05c6c4de61 dataprojektor | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| * phptestcase/master | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git branch -d phptestcase/master | |
| error: The branch 'phptestcase/master' is not fully merged. | |
| If you are sure you want to delete it, run 'git branch -D phptestcase/master'. | |
| rdpanek:Eshop radimdanielpanek$ git branch -D phptestcase/master | |
| Deleted branch phptestcase/master (was df5b3f6). | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| develop | |
| * master | |
| test | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| remotes/phptestcase/composer | |
| remotes/phptestcase/develop | |
| remotes/phptestcase/gh-pages | |
| remotes/phptestcase/master | |
| remotes/phptestcase/smazat | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b master_t phptestcase/master | |
| Branch master_t set up to track remote branch master from phptestcase. | |
| Switched to a new branch 'master_t' | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| develop | |
| master | |
| * master_t | |
| test | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| remotes/phptestcase/composer | |
| remotes/phptestcase/develop | |
| remotes/phptestcase/gh-pages | |
| remotes/phptestcase/master | |
| remotes/phptestcase/smazat | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master_t | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| * master_t | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git rebase master | |
| First, rewinding head to replay your work on top of it... | |
| Applying: init | |
| Using index info to reconstruct a base tree... | |
| <stdin>:756: trailing whitespace. | |
| * | |
| <stdin>:784: trailing whitespace. | |
| */ | |
| <stdin>:790: trailing whitespace. | |
| * | |
| <stdin>:803: trailing whitespace. | |
| <stdin>:809: trailing whitespace. | |
| * | |
| warning: squelched 880 whitespace errors | |
| warning: 885 lines add whitespace errors. | |
| Falling back to patching base and 3-way merge... | |
| Applying: pre-commit hooks: changed uprava pro pouziti v PHPTestCase | |
| Applying: pre-commit: changed support php pre-commit on windows | |
| Applying: skeleton/tests/testCase.php: changed: repair support @dataProvider | |
| Applying: pre-commit.php: changed: removed setPath php38 | |
| Applying: framework/Hooks/HookTest.php: changed: remove | |
| Applying: PHPUnit dir names fixed | |
| Using index info to reconstruct a base tree... | |
| <stdin>:32621: trailing whitespace. | |
| @echo off | |
| <stdin>:32622: trailing whitespace. | |
| REM PHPUnit | |
| <stdin>:32623: trailing whitespace. | |
| REM | |
| <stdin>:32624: trailing whitespace. | |
| REM Copyright (c) 2002-2010, Sebastian Bergmann <[email protected]>. | |
| <stdin>:32625: trailing whitespace. | |
| REM All rights reserved. | |
| warning: squelched 663 whitespace errors | |
| warning: 668 lines add whitespace errors. | |
| Falling back to patching base and 3-way merge... | |
| Applying: skeleton/tests/TestCase.php: changed: remove loader destination | |
| Applying: selenium support: upgrade: webdriver & example test | |
| Applying: phpunit.xml: changed: added strict and verbose attribute | |
| Applying: added: composer support, added composer.json | |
| Applying: added: MongoCursor marked as uncloneable object | |
| Applying: added: composer support, added composer.json | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| develop | |
| master | |
| * master_t | |
| test | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| remotes/phptestcase/composer | |
| remotes/phptestcase/develop | |
| remotes/phptestcase/gh-pages | |
| remotes/phptestcase/master | |
| remotes/phptestcase/smazat | |
| rdpanek:Eshop radimdanielpanek$ git remote rm phptestcase | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| develop | |
| master | |
| * master_t | |
| test | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| * master_t | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| D README.md | |
| Switched to branch 'master' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes not staged for commit: | |
| # (use "git add/rm <file>..." to update what will be committed) | |
| # (use "git checkout -- <file>..." to discard changes in working directory) | |
| # | |
| # deleted: README.md | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "rm" | |
| [master 660b673] rm | |
| 1 file changed, 4 deletions(-) | |
| delete mode 100644 README.md | |
| rdpanek:Eshop radimdanielpanek$ git cherry-pick 7d66314b2f48d56aa3b32e9144baeec09d3448c6 | |
| error: could not apply 7d66314... selenium support: upgrade: webdriver & example test | |
| hint: after resolving the conflicts, mark the corrected paths | |
| hint: with 'git add <paths>' or 'git rm <paths>' | |
| hint: and commit the result with 'git commit' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 1 commit. | |
| # | |
| # Changes to be committed: | |
| # | |
| # new file: framework/Selenium/WebDriver/README.md | |
| # new file: framework/Selenium/WebDriver/SampleTest.php | |
| # new file: framework/Selenium/WebDriver/WebDriverColorTest.php | |
| # new file: framework/Selenium/WebDriver/WebDriverSelectorTest.php | |
| # new file: framework/Selenium/WebDriver/WebDriverXPathTest.php | |
| # new file: skeleton/tests/case/selen/HomePageSeleniumTest.php | |
| # | |
| # Unmerged paths: | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # deleted by us: framework/Selenium/WebDriver/Driver.php | |
| # deleted by us: framework/Selenium/WebDriver/WebDriver.php | |
| # deleted by us: framework/Selenium/WebDriver/WebElement.php | |
| # deleted by us: skeleton/tests/TestCase.php | |
| # deleted by us: skeleton/tests/case/selen/readme.md | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git reset --hard HEAD | |
| HEAD is now at 660b673 rm | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 1 commit. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git cherry-pick 80ce5a6645cca09f8d6ddfb69042ed05c6c4de61 | |
| [master f8c6b12] dataprojektor | |
| 0 files changed | |
| create mode 100644 dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git tag | |
| v1.0.0 | |
| v1.1.0 | |
| rdpanek:Eshop radimdanielpanek$ git checkout c8951ed48d0de9337d9bbf555085250d4f4d1b5a | |
| Note: checking out 'c8951ed48d0de9337d9bbf555085250d4f4d1b5a'. | |
| You are in 'detached HEAD' state. You can look around, make experimental | |
| changes and commit them, and you can discard any commits you make in this | |
| state without impacting any branches by performing another checkout. | |
| If you want to create a new branch to retain commits you create, you may | |
| do so (now or later) by using -b with the checkout command again. Example: | |
| git checkout -b new_branch_name | |
| HEAD is now at c8951ed... phpunit.xml: changed: added strict and verbose attribute | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * (no branch) | |
| develop | |
| master | |
| master_t | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b phpunitxml | |
| M README.md | |
| Switched to a new branch 'phpunitxml' | |
| rdpanek:Eshop radimdanielpanek$ git tag v3 | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/tags/v | |
| v1.0.0 v1.1.0 v3 | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/tags/v3 | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| master_t | |
| * phpunitxml | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git show v3 | |
| commit c8951ed48d0de9337d9bbf555085250d4f4d1b5a | |
| Author: Radim Daniel Panek <[email protected]> | |
| Date: Tue Jul 24 12:51:13 2012 +0200 | |
| phpunit.xml: changed: added strict and verbose attribute | |
| diff --git a/skeleton/phpunit.xml b/skeleton/phpunit.xml | |
| index 7707bc8..5b440b1 100644 | |
| --- a/skeleton/phpunit.xml | |
| +++ b/skeleton/phpunit.xml | |
| @@ -4,7 +4,9 @@ | |
| bootstrap="./tests/TestCase.php" | |
| convertErrorsToExceptions="true" | |
| convertNoticesToExceptions="true" | |
| - convertWarningsToExceptions="true"> | |
| + convertWarningsToExceptions="true" | |
| + strict="true" | |
| + verbose="true"> | |
| <testsuites> | |
| <testsuite name="Ukazkovy test"> | |
| rdpanek:Eshop radimdanielpanek$ :q | |
| -bash: :q: command not found | |
| rdpanek:Eshop radimdanielpanek$ git tag | |
| v1.0.0 | |
| v1.1.0 | |
| v3 | |
| rdpanek:Eshop radimdanielpanek$ git show v3 | |
| rdpanek:Eshop radimdanielpanek$ git tag -a v4 -m "dalsi znacka" | |
| rdpanek:Eshop radimdanielpanek$ git tag | |
| v1.0.0 | |
| v1.1.0 | |
| v3 | |
| v4 | |
| rdpanek:Eshop radimdanielpanek$ git show v4 | |
| tag v4 | |
| Tagger: Dan <[email protected]> | |
| Date: Mon Oct 29 15:05:59 2012 +0100 | |
| dalsi znacka | |
| commit c8951ed48d0de9337d9bbf555085250d4f4d1b5a | |
| Author: Radim Daniel Panek <[email protected]> | |
| Date: Tue Jul 24 12:51:13 2012 +0200 | |
| phpunit.xml: changed: added strict and verbose attribute | |
| diff --git a/skeleton/phpunit.xml b/skeleton/phpunit.xml | |
| index 7707bc8..5b440b1 100644 | |
| --- a/skeleton/phpunit.xml | |
| +++ b/skeleton/phpunit.xml | |
| @@ -4,7 +4,9 @@ | |
| bootstrap="./tests/TestCase.php" | |
| convertErrorsToExceptions="true" | |
| convertNoticesToExceptions="true" | |
| - convertWarningsToExceptions="true"> | |
| + convertWarningsToExceptions="true" | |
| + strict="true" | |
| + verbose="true"> | |
| <testsuites> | |
| <testsuite name="Ukazkovy test"> | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/tags/v | |
| v1.0.0 v1.1.0 v3 v4 | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/tags/v4 | |
| rdpanek:Eshop radimdanielpanek$ git tag -a v4 -m "dalsi znacka" | |
| rdpanek:Eshop radimdanielpanek$ git show v4 | |
| tag v4 | |
| Tagger: Dan <[email protected]> | |
| Date: Mon Oct 29 15:05:59 2012 +0100 | |
| dalsi znacka | |
| commit c8951ed48d0de9337d9bbf555085250d4f4d1b5a | |
| Author: Radim Daniel Panek <[email protected]> | |
| Date: Tue Jul 24 12:51:13 2012 +0200 | |
| phpunit.xml: changed: added strict and verbose attribute | |
| diff --git a/skeleton/phpunit.xml b/skeleton/phpunit.xml | |
| index 7707bc8..5b440b1 100644 | |
| --- a/skeleton/phpunit.xml | |
| +++ b/skeleton/phpunit.xml | |
| @@ -4,7 +4,9 @@ | |
| bootstrap="./tests/TestCase.php" | |
| convertErrorsToExceptions="true" | |
| convertNoticesToExceptions="true" | |
| - convertWarningsToExceptions="true"> | |
| + convertWarningsToExceptions="true" | |
| + strict="true" | |
| + verbose="true"> | |
| <testsuites> | |
| <testsuite name="Ukazkovy test"> | |
| rdpanek:Eshop radimdanielpanek$ git tag | |
| v1.0.0 | |
| v1.1.0 | |
| v3 | |
| v4 | |
| rdpanek:Eshop radimdanielpanek$ git push --tags | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| Counting objects: 533, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (261/261), done. | |
| Writing objects: 100% (532/532), 589.03 KiB, done. | |
| Total 532 (delta 268), reused 506 (delta 255) | |
| To https://github.com/DeveloperHub/Eshop.git | |
| * [new tag] v1.0.0 -> v1.0.0 | |
| * [new tag] v1.1.0 -> v1.1.0 | |
| * [new tag] v3 -> v3 | |
| * [new tag] v4 -> v4 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch phpunitxml | |
| # 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: README.md | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git reset --hard HEAD | |
| HEAD is now at c8951ed phpunit.xml: changed: added strict and verbose attribute | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch phpunitxml | |
| # 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: readme.md | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git log --abrev-commit | |
| fatal: unrecognized argument: --abrev-commit | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| master_t | |
| * phpunitxml | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git show master | |
| commit f8c6b12df771dbea7e79ee8685f11ca23ff604fd | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 14:31:30 2012 +0100 | |
| dataprojektor | |
| diff --git a/dataprojektor b/dataprojektor | |
| new file mode 100644 | |
| index 0000000..e69de29 | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ git reflog | |
| c8951ed HEAD@{0}: checkout: moving from c8951ed48d0de9337d9bbf555085250d4f4d1b5a to phpuni | |
| c8951ed HEAD@{1}: checkout: moving from master to c8951ed48d0de9337d9bbf555085250d4f4d1b5a | |
| f8c6b12 HEAD@{2}: cherry-pick: dataprojektor | |
| 660b673 HEAD@{3}: commit: rm | |
| 85f364c HEAD@{4}: checkout: moving from master_t to master | |
| 8b7bb91 HEAD@{5}: rebase finished: returning to refs/heads/master_t | |
| 8b7bb91 HEAD@{6}: rebase: added: composer support, added composer.json | |
| db35422 HEAD@{7}: rebase: added: MongoCursor marked as uncloneable object | |
| ec8bfe1 HEAD@{8}: rebase: added: composer support, added composer.json | |
| c8951ed HEAD@{9}: rebase: phpunit.xml: changed: added strict and verbose attribute | |
| 7d66314 HEAD@{10}: rebase: selenium support: upgrade: webdriver & example test | |
| 694d3b3 HEAD@{11}: rebase: skeleton/tests/TestCase.php: changed: remove loader destination | |
| 2234be1 HEAD@{12}: rebase: PHPUnit dir names fixed | |
| 1d7443a HEAD@{13}: rebase: framework/Hooks/HookTest.php: changed: remove | |
| bd619f5 HEAD@{14}: rebase: pre-commit.php: changed: removed setPath php38 | |
| c8e37c1 HEAD@{15}: rebase: skeleton/tests/testCase.php: changed: repair support @dataProvi | |
| 9aac542 HEAD@{16}: rebase: pre-commit: changed support php pre-commit on windows | |
| 950bece HEAD@{17}: rebase: pre-commit hooks: changed uprava pro pouziti v PHPTestCase | |
| b96c07c HEAD@{18}: rebase: init | |
| 85f364c HEAD@{19}: checkout: moving from master_t to 85f364c28e5ddc1dbcde6bf0737e030077513 | |
| f31a2fa HEAD@{20}: checkout: moving from master to master_t | |
| 85f364c HEAD@{21}: checkout: moving from phptestcase/master to master | |
| df5b3f6 HEAD@{22}: checkout: moving from test to phptestcase/master | |
| df5b3f6 HEAD@{23}: checkout: moving from develop to test | |
| df5b3f6 HEAD@{24}: commit: cocka | |
| 80ce5a6 HEAD@{25}: commit: dataprojektor | |
| 85f364c HEAD@{26}: checkout: moving from master to develop | |
| 85f364c HEAD@{27}: checkout: moving from US1234 to master | |
| bcc42b7 HEAD@{28}: checkout: moving from master to US1234 | |
| 85f364c HEAD@{29}: checkout: moving from US1234 to master | |
| ...skipping... | |
| SUMMARY OF LESS COMMANDS | |
| Commands marked with * may be preceded by a number, N. | |
| Notes in parentheses indicate the behavior if N is given. | |
| h H Display this help. | |
| q :q Q :Q ZZ Exit. | |
| --------------------------------------------------------------------------- | |
| MOVING | |
| e ^E j ^N CR * Forward one line (or N lines). | |
| y ^Y k ^K ^P * Backward one line (or N lines). | |
| f ^F ^V SPACE * Forward one window (or N lines). | |
| b ^B ESC-v * Backward one window (or N lines). | |
| z * Forward one window (and set window to N). | |
| w * Backward one window (and set window to N). | |
| ESC-SPACE * Forward one window, but don't stop at end-of-file. | |
| d ^D * Forward one half-window (and set half-window to N). | |
| u ^U * Backward one half-window (and set half-window to N). | |
| ESC-) RightArrow * Left one half screen width (or N positions). | |
| ESC-( LeftArrow * Right one half screen width (or N positions). | |
| F Forward forever; like "tail -f". | |
| r ^R ^L Repaint screen. | |
| R Repaint screen, discarding buffered input. | |
| --------------------------------------------------- | |
| Default "window" is the screen height. | |
| Default "half-window" is half of the screen height. | |
| HELP -- Press RETURN for more, or q when done...skipping... | |
| c8951ed HEAD@{1}: checkout: moving from master to c8951ed48d0de9337d9bbf555085250d4f4d1b5a | |
| f8c6b12 HEAD@{2}: cherry-pick: dataprojektor | |
| 660b673 HEAD@{3}: commit: rm | |
| 85f364c HEAD@{4}: checkout: moving from master_t to master | |
| 8b7bb91 HEAD@{5}: rebase finished: returning to refs/heads/master_t | |
| 8b7bb91 HEAD@{6}: rebase: added: composer support, added composer.json | |
| db35422 HEAD@{7}: rebase: added: MongoCursor marked as uncloneable object | |
| ec8bfe1 HEAD@{8}: rebase: added: composer support, added composer.json | |
| c8951ed HEAD@{9}: rebase: phpunit.xml: changed: added strict and verbose attribute | |
| 7d66314 HEAD@{10}: rebase: selenium support: upgrade: webdriver & example test | |
| 694d3b3 HEAD@{11}: rebase: skeleton/tests/TestCase.php: changed: remove loader destination | |
| 2234be1 HEAD@{12}: rebase: PHPUnit dir names fixed | |
| 1d7443a HEAD@{13}: rebase: framework/Hooks/HookTest.php: changed: remove | |
| bd619f5 HEAD@{14}: rebase: pre-commit.php: changed: removed setPath php38 | |
| c8e37c1 HEAD@{15}: rebase: skeleton/tests/testCase.php: changed: repair support @dataProvi | |
| 9aac542 HEAD@{16}: rebase: pre-commit: changed support php pre-commit on windows | |
| 950bece HEAD@{17}: rebase: pre-commit hooks: changed uprava pro pouziti v PHPTestCase | |
| b96c07c HEAD@{18}: rebase: init | |
| 85f364c HEAD@{19}: checkout: moving from master_t to 85f364c28e5ddc1dbcde6bf0737e030077513 | |
| f31a2fa HEAD@{20}: checkout: moving from master to master_t | |
| 85f364c HEAD@{21}: checkout: moving from phptestcase/master to master | |
| df5b3f6 HEAD@{22}: checkout: moving from test to phptestcase/master | |
| df5b3f6 HEAD@{23}: checkout: moving from develop to test | |
| df5b3f6 HEAD@{24}: commit: cocka | |
| 80ce5a6 HEAD@{25}: commit: dataprojektor | |
| 85f364c HEAD@{26}: checkout: moving from master to develop | |
| 85f364c HEAD@{27}: checkout: moving from US1234 to master | |
| bcc42b7 HEAD@{28}: checkout: moving from master to US1234 | |
| 85f364c HEAD@{29}: checkout: moving from US1234 to master | |
| rdpanek:Eshop radimdanielpanek$ git show HEAD@{3} | |
| commit 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 14:52:14 2012 +0100 | |
| rm | |
| diff --git a/README.md b/README.md | |
| deleted file mode 100644 | |
| index a92a273..0000000 | |
| --- a/README.md | |
| +++ /dev/null | |
| @@ -1,4 +0,0 @@ | |
| -Eshop | |
| -===== | |
| - | |
| -Popis | |
| \ No newline at end of file | |
| rdpanek:Eshop radimdanielpanek$ git reflog | |
| c8951ed HEAD@{0}: checkout: moving from c8951ed48d0de9337d9bbf555085250d4f4d1b5a to phpuni | |
| c8951ed HEAD@{1}: checkout: moving from master to c8951ed48d0de9337d9bbf555085250d4f4d1b5a | |
| f8c6b12 HEAD@{2}: cherry-pick: dataprojektor | |
| 660b673 HEAD@{3}: commit: rm | |
| 85f364c HEAD@{4}: checkout: moving from master_t to master | |
| 8b7bb91 HEAD@{5}: rebase finished: returning to refs/heads/master_t | |
| 8b7bb91 HEAD@{6}: rebase: added: composer support, added composer.json | |
| db35422 HEAD@{7}: rebase: added: MongoCursor marked as uncloneable object | |
| ec8bfe1 HEAD@{8}: rebase: added: composer support, added composer.json | |
| c8951ed HEAD@{9}: rebase: phpunit.xml: changed: added strict and verbose attribute | |
| 7d66314 HEAD@{10}: rebase: selenium support: upgrade: webdriver & example test | |
| 694d3b3 HEAD@{11}: rebase: skeleton/tests/TestCase.php: changed: remove loader destination | |
| 2234be1 HEAD@{12}: rebase: PHPUnit dir names fixed | |
| 1d7443a HEAD@{13}: rebase: framework/Hooks/HookTest.php: changed: remove | |
| bd619f5 HEAD@{14}: rebase: pre-commit.php: changed: removed setPath php38 | |
| c8e37c1 HEAD@{15}: rebase: skeleton/tests/testCase.php: changed: repair support @dataProvi | |
| 9aac542 HEAD@{16}: rebase: pre-commit: changed support php pre-commit on windows | |
| 950bece HEAD@{17}: rebase: pre-commit hooks: changed uprava pro pouziti v PHPTestCase | |
| b96c07c HEAD@{18}: rebase: init | |
| 85f364c HEAD@{19}: checkout: moving from master_t to 85f364c28e5ddc1dbcde6bf0737e030077513 | |
| f31a2fa HEAD@{20}: checkout: moving from master to master_t | |
| 85f364c HEAD@{21}: checkout: moving from phptestcase/master to master | |
| df5b3f6 HEAD@{22}: checkout: moving from test to phptestcase/master | |
| df5b3f6 HEAD@{23}: checkout: moving from develop to test | |
| df5b3f6 HEAD@{24}: commit: cocka | |
| 80ce5a6 HEAD@{25}: commit: dataprojektor | |
| 85f364c HEAD@{26}: checkout: moving from master to develop | |
| 85f364c HEAD@{27}: checkout: moving from US1234 to master | |
| bcc42b7 HEAD@{28}: checkout: moving from master to US1234 | |
| rdpanek:Eshop radimdanielpanek$ gt branch | |
| -bash: gt: command not found | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| master_t | |
| * phpunitxml | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| error: Your local changes to the following files would be overwritten by checkout: | |
| readme.md | |
| Please, commit your changes or stash them before you can switch branches. | |
| Aborting | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "readme.md" | |
| [phpunitxml b137a4a] readme.md | |
| 1 file changed, 4 insertions(+), 55 deletions(-) | |
| rewrite readme.md (99%) | |
| mode change 100755 => 100644 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch phpunitxml | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| rdpanek:Eshop radimdanielpanek$ git checkou -b temp | |
| git: 'checkou' is not a git command. See 'git --help'. | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b temp | |
| Switched to a new branch 'temp' | |
| rdpanek:Eshop radimdanielpanek$ touch docasny | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "docasnyL | |
| > " | |
| [temp 3d7580c] docasnyL | |
| 0 files changed | |
| create mode 100644 docasny | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| rdpanek:Eshop radimdanielpanek$ git branch -D temp | |
| Deleted branch temp (was 3d7580c). | |
| rdpanek:Eshop radimdanielpanek$ git reflog | |
| f8c6b12 HEAD@{0}: checkout: moving from temp to master | |
| 3d7580c HEAD@{1}: commit: docasnyL | |
| f8c6b12 HEAD@{2}: checkout: moving from master to temp | |
| f8c6b12 HEAD@{3}: checkout: moving from phpunitxml to master | |
| b137a4a HEAD@{4}: commit: readme.md | |
| c8951ed HEAD@{5}: checkout: moving from c8951ed48d0de9337d9bbf555085250d4f4d1b5a to phpuni | |
| c8951ed HEAD@{6}: checkout: moving from master to c8951ed48d0de9337d9bbf555085250d4f4d1b5a | |
| f8c6b12 HEAD@{7}: cherry-pick: dataprojektor | |
| 660b673 HEAD@{8}: commit: rm | |
| 85f364c HEAD@{9}: checkout: moving from master_t to master | |
| 8b7bb91 HEAD@{10}: rebase finished: returning to refs/heads/master_t | |
| 8b7bb91 HEAD@{11}: rebase: added: composer support, added composer.json | |
| db35422 HEAD@{12}: rebase: added: MongoCursor marked as uncloneable object | |
| ec8bfe1 HEAD@{13}: rebase: added: composer support, added composer.json | |
| c8951ed HEAD@{14}: rebase: phpunit.xml: changed: added strict and verbose attribute | |
| 7d66314 HEAD@{15}: rebase: selenium support: upgrade: webdriver & example test | |
| 694d3b3 HEAD@{16}: rebase: skeleton/tests/TestCase.php: changed: remove loader destination | |
| 2234be1 HEAD@{17}: rebase: PHPUnit dir names fixed | |
| 1d7443a HEAD@{18}: rebase: framework/Hooks/HookTest.php: changed: remove | |
| bd619f5 HEAD@{19}: rebase: pre-commit.php: changed: removed setPath php38 | |
| c8e37c1 HEAD@{20}: rebase: skeleton/tests/testCase.php: changed: repair support @dataProvi | |
| 9aac542 HEAD@{21}: rebase: pre-commit: changed support php pre-commit on windows | |
| 950bece HEAD@{22}: rebase: pre-commit hooks: changed uprava pro pouziti v PHPTestCase | |
| b96c07c HEAD@{23}: rebase: init | |
| 85f364c HEAD@{24}: checkout: moving from master_t to 85f364c28e5ddc1dbcde6bf0737e030077513 | |
| f31a2fa HEAD@{25}: checkout: moving from master to master_t | |
| 85f364c HEAD@{26}: checkout: moving from phptestcase/master to master | |
| df5b3f6 HEAD@{27}: checkout: moving from test to phptestcase/master | |
| df5b3f6 HEAD@{28}: checkout: moving from develop to test | |
| rdpanek:Eshop radimdanielpanek$ git show 3d7580c | |
| commit 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 | |
| Author: Dan <[email protected]> | |
| Date: Mon Oct 29 15:13:31 2012 +0100 | |
| docasnyL | |
| diff --git a/docasny b/docasny | |
| new file mode 100644 | |
| index 0000000..e69de29 | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b temp 3d7580c | |
| Switched to a new branch 'temp' | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| master_t | |
| phpunitxml | |
| * temp | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b fix | |
| Switched to a new branch 'fix' | |
| rdpanek:Eshop radimdanielpanek$ touch nette | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "nette" | |
| [fix 6626131] nette | |
| 0 files changed | |
| create mode 100644 nette | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * fix | |
| master | |
| master_t | |
| phpunitxml | |
| temp | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| rdpanek:Eshop radimdanielpanek$ git branch -D fix | |
| Deleted branch fix (was 6626131). | |
| rdpanek:Eshop radimdanielpanek$ git reflog | |
| f8c6b12 HEAD@{0}: checkout: moving from fix to master | |
| 6626131 HEAD@{1}: commit: nette | |
| 3d7580c HEAD@{2}: checkout: moving from temp to fix | |
| 3d7580c HEAD@{3}: checkout: moving from master to temp | |
| f8c6b12 HEAD@{4}: checkout: moving from temp to master | |
| 3d7580c HEAD@{5}: commit: docasnyL | |
| f8c6b12 HEAD@{6}: checkout: moving from master to temp | |
| f8c6b12 HEAD@{7}: checkout: moving from phpunitxml to master | |
| b137a4a HEAD@{8}: commit: readme.md | |
| c8951ed HEAD@{9}: checkout: moving from c8951ed48d0de9337d9bbf555085250d4f4d1b5a to phpuni | |
| c8951ed HEAD@{10}: checkout: moving from master to c8951ed48d0de9337d9bbf555085250d4f4d1b5 | |
| f8c6b12 HEAD@{11}: cherry-pick: dataprojektor | |
| 660b673 HEAD@{12}: commit: rm | |
| 85f364c HEAD@{13}: checkout: moving from master_t to master | |
| 8b7bb91 HEAD@{14}: rebase finished: returning to refs/heads/master_t | |
| 8b7bb91 HEAD@{15}: rebase: added: composer support, added composer.json | |
| db35422 HEAD@{16}: rebase: added: MongoCursor marked as uncloneable object | |
| ec8bfe1 HEAD@{17}: rebase: added: composer support, added composer.json | |
| c8951ed HEAD@{18}: rebase: phpunit.xml: changed: added strict and verbose attribute | |
| 7d66314 HEAD@{19}: rebase: selenium support: upgrade: webdriver & example test | |
| 694d3b3 HEAD@{20}: rebase: skeleton/tests/TestCase.php: changed: remove loader destination | |
| 2234be1 HEAD@{21}: rebase: PHPUnit dir names fixed | |
| 1d7443a HEAD@{22}: rebase: framework/Hooks/HookTest.php: changed: remove | |
| bd619f5 HEAD@{23}: rebase: pre-commit.php: changed: removed setPath php38 | |
| c8e37c1 HEAD@{24}: rebase: skeleton/tests/testCase.php: changed: repair support @dataProvi | |
| 9aac542 HEAD@{25}: rebase: pre-commit: changed support php pre-commit on windows | |
| 950bece HEAD@{26}: rebase: pre-commit hooks: changed uprava pro pouziti v PHPTestCase | |
| b96c07c HEAD@{27}: rebase: init | |
| 85f364c HEAD@{28}: checkout: moving from master_t to 85f364c28e5ddc1dbcde6bf0737e030077513 | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b fix3 6626131 | |
| Switched to a new branch 'fix3' | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^ | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * fix3 | |
| master | |
| master_t | |
| phpunitxml | |
| temp | |
| test | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^ | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^^ | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^^ | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b vetev1 | |
| Switched to a new branch 'vetev1' | |
| rdpanek:Eshop radimdanielpanek$ touch obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "obsah1" | |
| [vetev1 0c670c6] obsah1 | |
| 0 files changed | |
| create mode 100644 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git checkout | |
| rdpanek:Eshop radimdanielpanek$ git reflog | |
| 0c670c6 HEAD@{0}: commit: obsah1 | |
| 6626131 HEAD@{1}: checkout: moving from fix3 to vetev1 | |
| 6626131 HEAD@{2}: checkout: moving from master to fix3 | |
| f8c6b12 HEAD@{3}: checkout: moving from fix to master | |
| 6626131 HEAD@{4}: commit: nette | |
| 3d7580c HEAD@{5}: checkout: moving from temp to fix | |
| 3d7580c HEAD@{6}: checkout: moving from master to temp | |
| f8c6b12 HEAD@{7}: checkout: moving from temp to master | |
| 3d7580c HEAD@{8}: commit: docasnyL | |
| f8c6b12 HEAD@{9}: checkout: moving from master to temp | |
| f8c6b12 HEAD@{10}: checkout: moving from phpunitxml to master | |
| b137a4a HEAD@{11}: commit: readme.md | |
| c8951ed HEAD@{12}: checkout: moving from c8951ed48d0de9337d9bbf555085250d4f4d1b5a to phpun | |
| c8951ed HEAD@{13}: checkout: moving from master to c8951ed48d0de9337d9bbf555085250d4f4d1b5 | |
| f8c6b12 HEAD@{14}: cherry-pick: dataprojektor | |
| 660b673 HEAD@{15}: commit: rm | |
| 85f364c HEAD@{16}: checkout: moving from master_t to master | |
| 8b7bb91 HEAD@{17}: rebase finished: returning to refs/heads/master_t | |
| 8b7bb91 HEAD@{18}: rebase: added: composer support, added composer.json | |
| db35422 HEAD@{19}: rebase: added: MongoCursor marked as uncloneable object | |
| ec8bfe1 HEAD@{20}: rebase: added: composer support, added composer.json | |
| c8951ed HEAD@{21}: rebase: phpunit.xml: changed: added strict and verbose attribute | |
| 7d66314 HEAD@{22}: rebase: selenium support: upgrade: webdriver & example test | |
| 694d3b3 HEAD@{23}: rebase: skeleton/tests/TestCase.php: changed: remove loader destination | |
| 2234be1 HEAD@{24}: rebase: PHPUnit dir names fixed | |
| 1d7443a HEAD@{25}: rebase: framework/Hooks/HookTest.php: changed: remove | |
| bd619f5 HEAD@{26}: rebase: pre-commit.php: changed: removed setPath php38 | |
| c8e37c1 HEAD@{27}: rebase: skeleton/tests/testCase.php: changed: repair support @dataProvi | |
| 9aac542 HEAD@{28}: rebase: pre-commit: changed support php pre-commit on windows | |
| rdpanek:Eshop radimdanielpanek$ git checkout HEAD@{3} | |
| Note: checking out 'HEAD@{3}'. | |
| You are in 'detached HEAD' state. You can look around, make experimental | |
| changes and commit them, and you can discard any commits you make in this | |
| state without impacting any branches by performing another checkout. | |
| If you want to create a new branch to retain commits you create, you may | |
| do so (now or later) by using -b with the checkout command again. Example: | |
| git checkout -b new_branch_name | |
| HEAD is now at f8c6b12... dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git checkout fix | |
| error: pathspec 'fix' did not match any file(s) known to git. | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * (no branch) | |
| develop | |
| fix3 | |
| master | |
| master_t | |
| phpunitxml | |
| temp | |
| test | |
| vetev1 | |
| rdpanek:Eshop radimdanielpanek$ git checkout fix3 | |
| Previous HEAD position was f8c6b12... dataprojektor | |
| Switched to branch 'fix3' | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b vetev2 | |
| Switched to a new branch 'vetev2' | |
| rdpanek:Eshop radimdanielpanek$ touch obsah2 | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "obsah2" | |
| [vetev2 3f3fb5c] obsah2 | |
| 0 files changed | |
| create mode 100644 obsah2 | |
| rdpanek:Eshop radimdanielpanek$ git merge vetev1 | |
| Merge made by the 'recursive' strategy. | |
| 0 files changed | |
| create mode 100644 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix3 | |
| master | |
| master_t | |
| phpunitxml | |
| temp | |
| test | |
| vetev1 | |
| * vetev2 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD | |
| * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| |\ | |
| | * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * | 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| |/ | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^ | |
| * 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^2 | |
| * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b vetvickaA | |
| Switched to a new branch 'vetvickaA' | |
| rdpanek:Eshop radimdanielpanek$ touch ObsahA | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "ObsahA" | |
| [vetvickaA 668b06c] ObsahA | |
| 0 files changed | |
| create mode 100644 ObsahA | |
| rdpanek:Eshop radimdanielpanek$ git checkout vetev2 | |
| Switched to branch 'vetev2' | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b vetvickaB | |
| Switched to a new branch 'vetvickaB' | |
| rdpanek:Eshop radimdanielpanek$ touch ObsahB | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "ObsahB" | |
| [vetvickaB d5d2aec] ObsahB | |
| 0 files changed | |
| create mode 100644 ObsahB | |
| rdpanek:Eshop radimdanielpanek$ git merge vetvickaB | |
| Already up-to-date. | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix3 | |
| master | |
| master_t | |
| phpunitxml | |
| temp | |
| test | |
| vetev1 | |
| vetev2 | |
| vetvickaA | |
| * vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ git merge vetvickaA | |
| Merge made by the 'recursive' strategy. | |
| 0 files changed | |
| create mode 100644 ObsahA | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph | |
| * fcc74f6d3f85fb91b38e8a5cb8f4cc81a7c3a7fd Merge branch 'vetvickaA' into vetvickaB | |
| |\ | |
| | * 668b06cfd773e8c6702e47ed47fd2fb3f54efde4 ObsahA | |
| * | d5d2aec2b42c2c19abc052dc8415b3db32fb1239 ObsahB | |
| |/ | |
| * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| |\ | |
| | * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * | 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| |/ | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD | |
| * fcc74f6d3f85fb91b38e8a5cb8f4cc81a7c3a7fd Merge branch 'vetvickaA' into vetvickaB | |
| |\ | |
| | * 668b06cfd773e8c6702e47ed47fd2fb3f54efde4 ObsahA | |
| * | d5d2aec2b42c2c19abc052dc8415b3db32fb1239 ObsahB | |
| |/ | |
| * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| |\ | |
| | * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * | 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| |/ | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^ | |
| * d5d2aec2b42c2c19abc052dc8415b3db32fb1239 ObsahB | |
| * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| |\ | |
| | * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * | 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| |/ | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^2 | |
| * 668b06cfd773e8c6702e47ed47fd2fb3f54efde4 ObsahA | |
| * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| |\ | |
| | * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * | 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| |/ | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^2^ | |
| * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| |\ | |
| | * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * | 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| |/ | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^2^^ | |
| * 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD^2^^2 | |
| * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~3 | |
| Successfully rebased and updated refs/heads/vetvickaB. | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaB..vetvickaA | |
| * 668b06cfd773e8c6702e47ed47fd2fb3f54efde4 ObsahA | |
| * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaB.. | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaB.. | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA.. | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA..vetvickaB | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA..git | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch vetvickaB | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA.. | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA..vetvickaB | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA.. | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA..HEAD | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA vetvickaB --not phpunitxml | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| | * 668b06cfd773e8c6702e47ed47fd2fb3f54efde4 ObsahA | |
| | * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| | |\ | |
| |/ / | |
| | * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| * | 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| |/ | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| rdpanek:Eshop radimdanielpanek$ git rebase HEAD~30 | |
| fatal: Needed a single revision | |
| invalid upstream HEAD~30 | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~30 | |
| fatal: Needed a single revision | |
| invalid upstream HEAD~30 | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~20 | |
| fatal: Needed a single revision | |
| invalid upstream HEAD~20 | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~10 | |
| fatal: Needed a single revision | |
| invalid upstream HEAD~10 | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~3 | |
| Successfully rebased and updated refs/heads/vetvickaB. | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickA...vetvickaB | |
| fatal: ambiguous argument 'vetvickA...vetvickaB': unknown revision or path not in the working tree. | |
| Use '--' to separate paths from revisions | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickA...vetev2 | |
| fatal: ambiguous argument 'vetvickA...vetev2': unknown revision or path not in the working tree. | |
| Use '--' to separate paths from revisions | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickA...phpunitxml | |
| fatal: ambiguous argument 'vetvickA...phpunitxml': unknown revision or path not in the working tree. | |
| Use '--' to separate paths from revisions | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA..vetvickaB | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph vetvickaA...vetvickaB | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| * 668b06cfd773e8c6702e47ed47fd2fb3f54efde4 ObsahA | |
| * 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| * 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph --left-right vetvickaA...vetvickaB | |
| > bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| > ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| > 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| < 668b06cfd773e8c6702e47ed47fd2fb3f54efde4 ObsahA | |
| < 5436edd2af1b4c3d579643b24b9203459ddf9100 Merge branch 'vetev1' into vetev2 | |
| < 0c670c66527c406825bc6e812aab77d6280f2009 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| * 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD~3 | |
| * 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph | |
| * bd3793142e5450546812a5affa1090ee5ac448ee ObsahA | |
| * ea8799eb2e9a368f808a2cb8db992cb8abbc4986 ObsahB | |
| * 96cd472daa57721b372eab9d4be9a8c26e5bae35 obsah1 | |
| * 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph HEAD~3 | |
| * 3f3fb5c2b79a3c6f8ca006e123e452585831f88e obsah2 | |
| * 66261316930dfee7dad735bd40a049cd56de205b nette | |
| * 3d7580c1b55cc9d08e5a5019b3b430230f06eeb6 docasnyL | |
| * f8c6b12df771dbea7e79ee8685f11ca23ff604fd dataprojektor | |
| * 660b6736c52a01e3ec22ed2e5eb67bd2970fc53d rm | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix3 | |
| master | |
| master_t | |
| phpunitxml | |
| temp | |
| test | |
| vetev1 | |
| vetev2 | |
| vetvickaA | |
| * vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ git merge vetvickaA | |
| Merge made by the 'recursive' strategy. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~3 | |
| The previous cherry-pick is now empty, possibly due to conflict resolution. | |
| If you wish to commit it anyway, use: | |
| git commit --allow-empty | |
| Otherwise, please use 'git reset' | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| Could not apply 0c670c6... obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git commit --allow-empty | |
| [detached HEAD 573db70] obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git reset --hard HEAD | |
| HEAD is now at 573db70 obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * (no branch) | |
| develop | |
| fix3 | |
| master | |
| master_t | |
| phpunitxml | |
| temp | |
| test | |
| vetev1 | |
| vetev2 | |
| vetvickaA | |
| vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Warning: you are leaving 1 commit behind, not connected to | |
| any of your branches: | |
| 573db70 obsah1 | |
| If you want to keep them by creating a new branch, this may be a good time | |
| to do so with: | |
| git branch new_branch_name 573db70c72b1716b16525200793d77a3821324d3 | |
| Switched to branch 'master' | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 2 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| fix3 | |
| * master | |
| master_t | |
| phpunitxml | |
| temp | |
| test | |
| vetev1 | |
| vetev2 | |
| vetvickaA | |
| vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ cd .git/refs/ | |
| heads/ remotes/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ cd .git/refs/heads/ | |
| rdpanek:heads radimdanielpanek$ ls -la | |
| total 88 | |
| drwxr-xr-x 14 radimdanielpanek staff 476 29 říj 16:30 . | |
| drwxr-xr-x 5 radimdanielpanek staff 170 29 říj 13:46 .. | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 14:33 develop | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 15:22 fix3 | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 14:53 master | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 14:41 master_t | |
| drwxr-xr-x 2 radimdanielpanek staff 68 29 říj 14:40 phptestcase | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 15:12 phpunitxml | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 15:14 temp | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 14:38 test | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 16:00 vetev1 | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 16:01 vetev2 | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 16:03 vetvickaA | |
| -rw-r--r-- 1 radimdanielpanek staff 41 29 říj 16:30 vetvickaB | |
| rdpanek:heads radimdanielpanek$ rm -rf !master * | |
| -bash: !master: event not found | |
| rdpanek:heads radimdanielpanek$ git log --pretty=oneline --graph HEAD~3 | |
| rdpanek:heads radimdanielpanek$ tm -rf * | |
| -bash: tm: command not found | |
| rdpanek:heads radimdanielpanek$ rm -rf * | |
| rdpanek:heads radimdanielpanek$ ls -la | |
| total 0 | |
| drwxr-xr-x 2 radimdanielpanek staff 68 29 říj 16:32 . | |
| drwxr-xr-x 5 radimdanielpanek staff 170 29 říj 13:46 .. | |
| rdpanek:heads radimdanielpanek$ vim develop | |
| rdpanek:heads radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop/.git/refs/heads | |
| rdpanek:heads radimdanielpanek$ ls | |
| develop | |
| rdpanek:heads radimdanielpanek$ cd ../../../ | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ ls | |
| dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 0 | |
| drwxr-xr-x 4 radimdanielpanek staff 136 29 říj 16:31 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 13:46 .. | |
| drwxr-xr-x 17 radimdanielpanek staff 578 29 říj 16:33 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 0 29 říj 15:13 dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ vim dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # | |
| # Initial commit | |
| # | |
| # Changes to be committed: | |
| # (use "git rm --cached <file>..." to unstage) | |
| # | |
| # new file: dataprojektor | |
| # | |
| # 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: dataprojektor | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git reset --hard HEAD | |
| fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree. | |
| Use '--' to separate paths from revisions | |
| rdpanek:Eshop radimdanielpanek$ git satus | |
| git: 'satus' is not a git command. See 'git --help'. | |
| Did you mean this? | |
| status | |
| rdpanek:Eshop radimdanielpanek$ git satus | |
| rdpanek:Eshop radimdanielpanek$ git satus | |
| git: 'satus' is not a git command. See 'git --help'. | |
| Did you mean this? | |
| status | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # | |
| # Initial commit | |
| # | |
| # Changes to be committed: | |
| # (use "git rm --cached <file>..." to unstage) | |
| # | |
| # new file: dataprojektor | |
| # | |
| # 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: dataprojektor | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git rm --cached dataprojektor | |
| error: 'dataprojektor' has staged content different from both the file and the HEAD | |
| (use -f to force removal) | |
| rdpanek:Eshop radimdanielpanek$ git rm --cached dataprojektor -f | |
| rm 'dataprojektor' | |
| rdpanek:Eshop radimdanielpanek$ git satus | |
| git: 'satus' is not a git command. See 'git --help'. | |
| Did you mean this? | |
| status | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # | |
| # Initial commit | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # dataprojektor | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git add dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "dataprojektor" | |
| [master (root-commit) b49f230] dataprojektor | |
| 1 file changed, 4 insertions(+) | |
| create mode 100644 dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ vim dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 1 and 1 different commit each, respectively. | |
| # | |
| # 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: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ vim dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git diff dataprojektor | |
| diff --git a/dataprojektor b/dataprojektor | |
| index b08cad0..991703c 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -2,3 +2,6 @@ zarovka | |
| stinitko | |
| napajeni | |
| cocka | |
| +kabel | |
| +rgb | |
| +tlacitka | |
| rdpanek:Eshop radimdanielpanek$ git add -i | |
| staged unstaged path | |
| 1: unchanged +3/-0 dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> s | |
| staged unstaged path | |
| 1: unchanged +3/-0 dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> u | |
| staged unstaged path | |
| 1: unchanged +3/-0 [d]ataprojektor | |
| Update>> 1 | |
| staged unstaged path | |
| * 1: unchanged +3/-0 [d]ataprojektor | |
| Update>> | |
| updated one path | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> s | |
| staged unstaged path | |
| 1: +3/-0 nothing dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> r | |
| staged unstaged path | |
| 1: +3/-0 nothing [d]ataprojektor | |
| Revert>> 1 | |
| staged unstaged path | |
| * 1: +3/-0 nothing [d]ataprojektor | |
| Revert>> | |
| reverted one path | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> s | |
| staged unstaged path | |
| 1: unchanged +3/-0 dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> 6 | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> q | |
| Bye. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 1 and 1 different commit each, respectively. | |
| # | |
| # 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: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add -i | |
| staged unstaged path | |
| 1: unchanged +3/-0 dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> u | |
| staged unstaged path | |
| 1: unchanged +3/-0 [d]ataprojektor | |
| Update>> 1 | |
| staged unstaged path | |
| * 1: unchanged +3/-0 [d]ataprojektor | |
| Update>> | |
| updated one path | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> q | |
| Bye. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 1 and 1 different commit each, respectively. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: dataprojektor | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git add -i | |
| staged unstaged path | |
| 1: +3/-0 nothing dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> r | |
| staged unstaged path | |
| 1: +3/-0 nothing [d]ataprojektor | |
| Revert>> 1 | |
| staged unstaged path | |
| * 1: +3/-0 nothing [d]ataprojektor | |
| Revert>> | |
| reverted one path | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> q | |
| Bye. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 1 and 1 different commit each, respectively. | |
| # | |
| # 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: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 1 and 1 different commit each, respectively. | |
| # | |
| # 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: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add -i | |
| staged unstaged path | |
| 1: unchanged +3/-0 dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> p | |
| staged unstaged path | |
| 1: unchanged +3/-0 [d]ataprojektor | |
| Patch update>> 1 | |
| staged unstaged path | |
| * 1: unchanged +3/-0 [d]ataprojektor | |
| Patch update>> | |
| diff --git a/dataprojektor b/dataprojektor | |
| index b08cad0..991703c 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -2,3 +2,6 @@ zarovka | |
| stinitko | |
| napajeni | |
| cocka | |
| +kabel | |
| +rgb | |
| +tlacitka | |
| Stage this hunk [y,n,q,a,d,/,e,?]? e | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> q | |
| Bye. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 1 and 1 different commit each, respectively. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: dataprojektor | |
| # | |
| # 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: dataprojektor | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git diff dataprojektor | |
| diff --git a/dataprojektor b/dataprojektor | |
| index 6949556..991703c 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -2,4 +2,6 @@ zarovka | |
| stinitko | |
| napajeni | |
| cocka | |
| +kabel | |
| rgb | |
| +tlacitka | |
| rdpanek:Eshop radimdanielpanek$ git diff dataprojektor --index | |
| fatal: bad flag '--index' used after filename | |
| rdpanek:Eshop radimdanielpanek$ git diff --index | |
| error: invalid option: --index | |
| rdpanek:Eshop radimdanielpanek$ git dif | |
| rdpanek:Eshop radimdanielpanek$ man git-diff | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ git diff --cached | |
| diff --git a/dataprojektor b/dataprojektor | |
| index b08cad0..6949556 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -2,3 +2,4 @@ zarovka | |
| stinitko | |
| napajeni | |
| cocka | |
| +rgb | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "rgb" | |
| [master 1dd172d] rgb | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git add -i | |
| staged unstaged path | |
| 1: unchanged +2/-0 dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> p | |
| staged unstaged path | |
| 1: unchanged +2/-0 [d]ataprojektor | |
| Patch update>> 1 | |
| staged unstaged path | |
| * 1: unchanged +2/-0 [d]ataprojektor | |
| Patch update>> 1 | |
| staged unstaged path | |
| * 1: unchanged +2/-0 [d]ataprojektor | |
| Patch update>> | |
| diff --git a/dataprojektor b/dataprojektor | |
| index 6949556..991703c 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -2,4 +2,6 @@ zarovka | |
| stinitko | |
| napajeni | |
| cocka | |
| +kabel | |
| rgb | |
| +tlacitka | |
| Stage this hunk [y,n,q,a,d,/,s,e,?]? ed | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> q | |
| Bye. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 2 and 1 different commit each, respectively. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: dataprojektor | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git diff --cached | |
| diff --git a/dataprojektor b/dataprojektor | |
| index 6949556..991703c 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -2,4 +2,6 @@ zarovka | |
| stinitko | |
| napajeni | |
| cocka | |
| +kabel | |
| rgb | |
| +tlacitka | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "dalsi" | |
| [master 1639d70] dalsi | |
| 1 file changed, 2 insertions(+) | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 8 | |
| drwxr-xr-x 4 radimdanielpanek staff 136 29 říj 16:37 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 13:46 .. | |
| drwxr-xr-x 17 radimdanielpanek staff 578 29 říj 16:44 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 51 29 říj 16:35 dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 3 and 1 different commit each, respectively. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ vim dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 3 and 1 different commit each, respectively. | |
| # | |
| # 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: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add -i | |
| staged unstaged path | |
| 1: unchanged +2/-0 dataprojektor | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> p | |
| staged unstaged path | |
| 1: unchanged +2/-0 [d]ataprojektor | |
| Patch update>> 1 | |
| staged unstaged path | |
| * 1: unchanged +2/-0 [d]ataprojektor | |
| Patch update>> | |
| diff --git a/dataprojektor b/dataprojektor | |
| index 991703c..349aaa4 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -5,3 +5,5 @@ cocka | |
| kabel | |
| rgb | |
| tlacitka | |
| +hdmi | |
| +vga | |
| Stage this hunk [y,n,q,a,d,/,e,?]? e | |
| *** Commands *** | |
| 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked | |
| 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp | |
| What now> q | |
| Bye. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 3 and 1 different commit each, respectively. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: dataprojektor | |
| # | |
| # 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: dataprojektor | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git diff --cached | |
| diff --git a/dataprojektor b/dataprojektor | |
| index 991703c..ce4d2d5 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -5,3 +5,4 @@ cocka | |
| kabel | |
| rgb | |
| tlacitka | |
| +hdmi | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "hdmi" | |
| [master e6f9665] hdmi | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 4 and 1 different commit each, respectively. | |
| # | |
| # 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: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git diff | |
| diff --git a/dataprojektor b/dataprojektor | |
| index ce4d2d5..349aaa4 100644 | |
| --- a/dataprojektor | |
| +++ b/dataprojektor | |
| @@ -6,3 +6,4 @@ kabel | |
| rgb | |
| tlacitka | |
| hdmi | |
| +vga | |
| rdpanek:Eshop radimdanielpanek$ git commit -a -m "vga" | |
| [master 15bbf57] vga | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 5 and 1 different commit each, respectively. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph --branches | |
| * 15bbf57ea9dad05fc024e2b6d0d8f3a5b65cc3c2 vga | |
| * e6f966501b17467c294ddbdf03f11c3638cf8129 hdmi | |
| * 1639d704bc7a6ce40173225078fca16b3727942f dalsi | |
| * 1dd172dcbfa6984ada6ec59382de15580a1a0a41 rgb | |
| * b49f230ed99611866b51a535028de29e1f1e9ce2 dataprojektor | |
| * c8951ed48d0de9337d9bbf555085250d4f4d1b5a phpunit.xml: changed: added strict and verbose | |
| * 7d66314b2f48d56aa3b32e9144baeec09d3448c6 selenium support: upgrade: webdriver & example | |
| * 694d3b37abc47706fdc9389cb6b9315aceae33cd skeleton/tests/TestCase.php: changed: remove lo | |
| * 2234be1e207c00d38007168052c45a72ebf3e17a PHPUnit dir names fixed | |
| * 1d7443a9628a8db17570464f433e148aa55ebb20 framework/Hooks/HookTest.php: changed: remove | |
| * bd619f56b05ebaec3118761dc393a06450246cc0 pre-commit.php: changed: removed setPath php38 | |
| * c8e37c1ca25c930b4b1c48bba30ecd63ee95d786 skeleton/tests/testCase.php: changed: repair su | |
| * 9aac542267743c6c71e23e4819e6f2eea82bac2c pre-commit: changed support php pre-commit on w | |
| * 950bece84ac81a17b3d001bc2009de92240fbb57 pre-commit hooks: changed uprava pro pouziti v | |
| * b96c07cefbb811ceda708cf87a5cc4c7e1a55273 init | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| ...skipping... | |
| * 15bbf57ea9dad05fc024e2b6d0d8f3a5b65cc3c2 vga | |
| * e6f966501b17467c294ddbdf03f11c3638cf8129 hdmi | |
| * 1639d704bc7a6ce40173225078fca16b3727942f dalsi | |
| * 1dd172dcbfa6984ada6ec59382de15580a1a0a41 rgb | |
| * b49f230ed99611866b51a535028de29e1f1e9ce2 dataprojektor | |
| * c8951ed48d0de9337d9bbf555085250d4f4d1b5a phpunit.xml: changed: added strict and verbose | |
| * 7d66314b2f48d56aa3b32e9144baeec09d3448c6 selenium support: upgrade: webdriver & example | |
| * 694d3b37abc47706fdc9389cb6b9315aceae33cd skeleton/tests/TestCase.php: changed: remove lo | |
| * 2234be1e207c00d38007168052c45a72ebf3e17a PHPUnit dir names fixed | |
| * 1d7443a9628a8db17570464f433e148aa55ebb20 framework/Hooks/HookTest.php: changed: remove | |
| * bd619f56b05ebaec3118761dc393a06450246cc0 pre-commit.php: changed: removed setPath php38 | |
| * c8e37c1ca25c930b4b1c48bba30ecd63ee95d786 skeleton/tests/testCase.php: changed: repair su | |
| * 9aac542267743c6c71e23e4819e6f2eea82bac2c pre-commit: changed support php pre-commit on w | |
| * 950bece84ac81a17b3d001bc2009de92240fbb57 pre-commit hooks: changed uprava pro pouziti v | |
| * b96c07cefbb811ceda708cf87a5cc4c7e1a55273 init | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| ~ | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD | |
| It seems that there is already a rebase-merge directory, and | |
| I wonder if you are in the middle of another rebase. If that is the | |
| case, please try | |
| git rebase (--continue | --abort | --skip) | |
| If that is not the case, please | |
| rm -fr /Volumes/HTDOCS/temp/Eshop/.git/rebase-merge | |
| and run me again. I am stopping in case you still have something | |
| valuable there. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD | |
| rdpanek:Eshop radimdanielpanek$ git rebase --abort | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| * vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| The previous cherry-pick is now empty, possibly due to conflict resolution. | |
| If you wish to commit it anyway, use: | |
| git commit --allow-empty | |
| Otherwise, please use 'git reset' | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| Could not apply 0c670c6... obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Previous HEAD position was bd37931... ObsahA | |
| Switched to branch 'master' | |
| Your branch and 'origin/master' have diverged, | |
| and have 5 and 1 different commit each, respectively. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 5 and 1 different commit each, respectively. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| It seems that there is already a rebase-merge directory, and | |
| I wonder if you are in the middle of another rebase. If that is the | |
| case, please try | |
| git rebase (--continue | --abort | --skip) | |
| If that is not the case, please | |
| rm -fr /Volumes/HTDOCS/temp/Eshop/.git/rebase-merge | |
| and run me again. I am stopping in case you still have something | |
| valuable there. | |
| rdpanek:Eshop radimdanielpanek$ git checkout --abort | |
| error: unknown option `abort' | |
| usage: git checkout [options] <branch> | |
| or: git checkout [options] [<branch>] -- <file>... | |
| -q, --quiet suppress progress reporting | |
| -b <branch> create and checkout a new branch | |
| -B <branch> create/reset and checkout a branch | |
| -l create reflog for new branch | |
| --detach detach the HEAD at named commit | |
| -t, --track set upstream info for new branch | |
| --orphan <new branch> | |
| new unparented branch | |
| -2, --ours checkout our version for unmerged files | |
| -3, --theirs checkout their version for unmerged files | |
| -f, --force force checkout (throw away local modifications) | |
| -m, --merge perform a 3-way merge with the new branch | |
| --overwrite-ignore update ignored files (default) | |
| --conflict <style> conflict style (merge or diff3) | |
| -p, --patch select hunks interactively | |
| rdpanek:Eshop radimdanielpanek$ git rebase --abort | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| The previous cherry-pick is now empty, possibly due to conflict resolution. | |
| If you wish to commit it anyway, use: | |
| git commit --allow-empty | |
| Otherwise, please use 'git reset' | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| Could not apply 0c670c6... obsah1 | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * (no branch) | |
| develop | |
| master | |
| vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Previous HEAD position was bd37931... ObsahA | |
| Switched to branch 'master' | |
| Your branch and 'origin/master' have diverged, | |
| and have 5 and 1 different commit each, respectively. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 5 and 1 different commit each, respectively. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| It seems that there is already a rebase-merge directory, and | |
| I wonder if you are in the middle of another rebase. If that is the | |
| case, please try | |
| git rebase (--continue | --abort | --skip) | |
| If that is not the case, please | |
| rm -fr /Volumes/HTDOCS/temp/Eshop/.git/rebase-merge | |
| and run me again. I am stopping in case you still have something | |
| valuable there. | |
| rdpanek:Eshop radimdanielpanek$ git rebase --abort | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| master | |
| * vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| Your branch and 'origin/master' have diverged, | |
| and have 5 and 1 different commit each, respectively. | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| develop | |
| * master | |
| vetvickaB | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| Stopped at 1dd172d... rgb | |
| You can amend the commit now, with | |
| git commit --amend | |
| Once you are satisfied with your changes, run | |
| git rebase --continue | |
| rdpanek:Eshop radimdanielpanek$ git commit --amned | |
| error: unknown option `amned' | |
| usage: git commit [options] [--] <filepattern>... | |
| -q, --quiet suppress summary after successful commit | |
| -v, --verbose show diff in commit message template | |
| Commit message options | |
| -F, --file <file> read message from file | |
| --author <author> override author for commit | |
| --date <date> override date for commit | |
| -m, --message <message> | |
| commit message | |
| -c, --reedit-message <commit> | |
| reuse and edit message from specified commit | |
| -C, --reuse-message <commit> | |
| reuse message from specified commit | |
| --fixup <commit> use autosquash formatted message to fixup specified commit | |
| --squash <commit> use autosquash formatted message to squash specified commit | |
| --reset-author the commit is authored by me now (used with -C/-c/--amend) | |
| -s, --signoff add Signed-off-by: | |
| -t, --template <file> | |
| use specified template file | |
| -e, --edit force edit of commit | |
| --cleanup <default> how to strip spaces and #comments from message | |
| --status include status in commit message template | |
| -S, --gpg-sign[=<key id>] | |
| GPG sign commit | |
| Commit contents options | |
| -a, --all commit all changed files | |
| -i, --include add specified files to index for commit | |
| --interactive interactively add files | |
| -p, --patch interactively add changes | |
| -o, --only commit only specified files | |
| -n, --no-verify bypass pre-commit hook | |
| --dry-run show what would be committed | |
| --short show status concisely | |
| --branch show branch information | |
| --porcelain machine-readable output | |
| -z, --null terminate entries with NUL | |
| --amend amend previous commit | |
| --no-post-rewrite bypass post-rewrite hook | |
| -u, --untracked-files[=<mode>] | |
| show untracked files, optional modes: all, normal, no. (Default: all) | |
| rdpanek:Eshop radimdanielpanek$ git commit --amend | |
| [detached HEAD 5b61e03] rgb2 | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| Successfully rebased and updated refs/heads/master. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| Stopped at 687b669... dalsi | |
| You can amend the commit now, with | |
| git commit --amend | |
| Once you are satisfied with your changes, run | |
| git rebase --continue | |
| rdpanek:Eshop radimdanielpanek$ git commit --amend | |
| [detached HEAD bd2c69e] dalsi2 | |
| 1 file changed, 2 insertions(+) | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| Successfully rebased and updated refs/heads/master. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| Stopped at 5b61e03... rgb2 | |
| You can amend the commit now, with | |
| git commit --amend | |
| Once you are satisfied with your changes, run | |
| git rebase --continue | |
| rdpanek:Eshop radimdanielpanek$ git commit --amend | |
| [detached HEAD 2836ebd] rgb2 | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| Successfully rebased and updated refs/heads/master. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| Stopped at 2836ebd... rgb2 | |
| You can amend the commit now, with | |
| git commit --amend | |
| Once you are satisfied with your changes, run | |
| git rebase --continue | |
| rdpanek:Eshop radimdanielpanek$ git commit --amend | |
| [detached HEAD 0b78b26] rgb2 | |
| 1 file changed, 1 insertion(+) | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| Successfully rebased and updated refs/heads/master. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| error: could not apply ba8e7ec... hdmi | |
| When you have resolved this problem run "git rebase --continue". | |
| If you would prefer to skip this patch, instead run "git rebase --skip". | |
| To check out the original branch and stop rebasing run "git rebase --abort". | |
| Could not apply ba8e7ec... hdmi | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| dataprojektor: needs merge | |
| You must edit all merge conflicts and then | |
| mark them as resolved using git add | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # Not currently on any branch. | |
| # Unmerged paths: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ vim dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git add dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| [detached HEAD f240bc1] hdmi | |
| 1 file changed, 2 insertions(+) | |
| Successfully rebased and updated refs/heads/master. | |
| rdpanek:Eshop radimdanielpanek$ git reflog | |
| 63e5e11 HEAD@{0}: rebase -i (finish): returning to refs/heads/master | |
| 63e5e11 HEAD@{1}: rebase -i (pick): vga | |
| f240bc1 HEAD@{2}: rebase -i (continue): hdmi | |
| 0b78b26 HEAD@{3}: checkout: moving from master to 0b78b26 | |
| 0c29134 HEAD@{4}: rebase -i (finish): returning to refs/heads/master | |
| 0c29134 HEAD@{5}: rebase -i (pick): vga | |
| ba8e7ec HEAD@{6}: rebase -i (pick): hdmi | |
| 178a2c0 HEAD@{7}: rebase -i (pick): dalsi2 | |
| 0b78b26 HEAD@{8}: commit (amend): rgb2 | |
| 2836ebd HEAD@{9}: cherry-pick | |
| b49f230 HEAD@{10}: checkout: moving from master to b49f230ed99611866b51a535028de29e1f1e9ce | |
| 8ed3d31 HEAD@{11}: rebase -i (finish): returning to refs/heads/master | |
| 8ed3d31 HEAD@{12}: rebase -i (pick): vga | |
| 2253282 HEAD@{13}: rebase -i (pick): hdmi | |
| 1a7781a HEAD@{14}: rebase -i (pick): dalsi2 | |
| 2836ebd HEAD@{15}: commit (amend): rgb2 | |
| 5b61e03 HEAD@{16}: cherry-pick | |
| b49f230 HEAD@{17}: checkout: moving from master to b49f230ed99611866b51a535028de29e1f1e9ce | |
| 5bc48cc HEAD@{18}: rebase -i (finish): returning to refs/heads/master | |
| 5bc48cc HEAD@{19}: rebase -i (pick): vga | |
| 084dc6a HEAD@{20}: rebase -i (pick): hdmi | |
| bd2c69e HEAD@{21}: commit (amend): dalsi2 | |
| 687b669 HEAD@{22}: cherry-pick | |
| 5b61e03 HEAD@{23}: checkout: moving from master to 5b61e03 | |
| f8951d3 HEAD@{24}: rebase -i (finish): returning to refs/heads/master | |
| f8951d3 HEAD@{25}: rebase -i (pick): vga | |
| 7f9ac18 HEAD@{26}: rebase -i (pick): hdmi | |
| 687b669 HEAD@{27}: rebase -i (pick): dalsi | |
| 5b61e03 HEAD@{28}: commit (amend): rgb2 | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~4 | |
| fatal: Needed a single revision | |
| invalid upstream HEAD~4 | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~3 | |
| error: could not apply 63e5e11... vga | |
| When you have resolved this problem run "git rebase --continue". | |
| If you would prefer to skip this patch, instead run "git rebase --skip". | |
| To check out the original branch and stop rebasing run "git rebase --abort". | |
| Could not apply 63e5e11... vga | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # Not currently on any branch. | |
| # Unmerged paths: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| [detached HEAD edc6f8f] vga | |
| 1 file changed, 6 insertions(+) | |
| error: could not apply f240bc1... hdmi | |
| When you have resolved this problem run "git rebase --continue". | |
| If you would prefer to skip this patch, instead run "git rebase --skip". | |
| To check out the original branch and stop rebasing run "git rebase --abort". | |
| Could not apply f240bc1... hdmi | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # Not currently on any branch. | |
| # Unmerged paths: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: dataprojektor | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:Eshop radimdanielpanek$ git add dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ vim dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git add dataprojektor | |
| rdpanek:Eshop radimdanielpanek$ git rebase --continue | |
| [detached HEAD 7e15829] hdmi | |
| 1 file changed, 2 insertions(+), 3 deletions(-) | |
| Successfully rebased and updated refs/heads/master. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~3 | |
| [detached HEAD f14064b] vga + hdmi | |
| 1 file changed, 5 insertions(+) | |
| Successfully rebased and updated refs/heads/master. | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~3 | |
| fatal: Needed a single revision | |
| invalid upstream HEAD~3 | |
| rdpanek:Eshop radimdanielpanek$ git rebase -i HEAD~2 | |
| [detached HEAD 03f39cc] rgb2 + vga + hdmi | |
| 1 file changed, 6 insertions(+) | |
| Successfully rebased and updated refs/heads/master. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 2 and 1 different commit each, respectively. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ | |
| Last login: Mon Oct 29 09:00:54 on ttys003 | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 2 and 1 different commit each, respectively. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git submodule add https://github.com/DeveloperHub/PHPTestCase.git libs/PHPTestCase | |
| Cloning into 'libs/PHPTestCase'... | |
| remote: Counting objects: 569, done. | |
| remote: Compressing objects: 100% (276/276), done. | |
| remote: Total 569 (delta 279), reused 561 (delta 271) | |
| Receiving objects: 100% (569/569), 596.99 KiB | 331 KiB/s, done. | |
| Resolving deltas: 100% (279/279), done. | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ vim .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ git submodule status | |
| f31a2fafe387292feee1259c35f04268c1e4ffb9 libs/PHPTestCase (v1.1.0-2-gf31a2fa) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 2 and 1 different commit each, respectively. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: .gitmodules | |
| # new file: libs/PHPTestCase | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "PHPTestCase: added" | |
| [master c2bf95b] PHPTestCase: added | |
| 2 files changed, 4 insertions(+) | |
| create mode 100644 .gitmodules | |
| create mode 160000 libs/PHPTestCase | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch and 'origin/master' have diverged, | |
| # and have 3 and 1 different commit each, respectively. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ cd ../ | |
| rdpanek:temp radimdanielpanek$ rm -rf Eshop | |
| rdpanek:temp radimdanielpanek$ git clone https://github.com/DeveloperHub/Eshop.git | |
| Cloning into 'Eshop'... | |
| remote: Counting objects: 542, done. | |
| remote: Compressing objects: 100% (255/255), done. | |
| remote: Total 542 (delta 268), reused 539 (delta 268) | |
| Receiving objects: 100% (542/542), 589.90 KiB | 162 KiB/s, done. | |
| Resolving deltas: 100% (268/268), done. | |
| rdpanek:temp radimdanielpanek$ cd Eshop | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ vim .gitm | |
| rdpanek:Eshop radimdanielpanek$ | |
| rdpanek:Eshop radimdanielpanek$ git submodule add https://github.com/DeveloperHub/PHPTestCase.git libs/PHPTestCase | |
| Cloning into 'libs/PHPTestCase'... | |
| remote: Counting objects: 569, done. | |
| remote: Compressing objects: 100% (276/276), done. | |
| remote: Total 569 (delta 279), reused 561 (delta 271) | |
| Receiving objects: 100% (569/569), 596.99 KiB | 302 KiB/s, done. | |
| Resolving deltas: 100% (279/279), done. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: .gitmodules | |
| # new file: libs/PHPTestCase | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "PHPTestCase: added" | |
| [master 3561dbf] PHPTestCase: added | |
| 2 files changed, 4 insertions(+) | |
| create mode 100644 .gitmodules | |
| create mode 160000 libs/PHPTestCase | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 1 commit. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git push | |
| Username for 'https://github.com': Radim-Daniel-Panek | |
| Password for 'https://[email protected]': | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 446 bytes, done. | |
| Total 4 (delta 0), reused 0 (delta 0) | |
| To https://github.com/DeveloperHub/Eshop.git | |
| 85f364c..3561dbf master -> master | |
| rdpanek:Eshop radimdanielpanek$ cd ../ | |
| rdpanek:temp radimdanielpanek$ rm -rf Eshop | |
| rdpanek:temp radimdanielpanek$ git clone https://github.com/DeveloperHub/Eshop.git | |
| Cloning into 'Eshop'... | |
| remote: Counting objects: 546, done. | |
| remote: Compressing objects: 100% (258/258), done. | |
| remote: Total 546 (delta 268), reused 543 (delta 268) | |
| Receiving objects: 100% (546/546), 590.30 KiB | 315 KiB/s, done. | |
| Resolving deltas: 100% (268/268), done. | |
| rdpanek:temp radimdanielpanek$ cd Eshop | |
| rdpanek:Eshop radimdanielpanek$ git submodule update --init | |
| Submodule 'libs/PHPTestCase' (https://github.com/DeveloperHub/PHPTestCase.git) registered for path 'libs/PHPTestCase' | |
| Cloning into 'libs/PHPTestCase'... | |
| remote: Counting objects: 569, done. | |
| remote: Compressing objects: 100% (276/276), done. | |
| remote: Total 569 (delta 279), reused 561 (delta 271) | |
| Receiving objects: 100% (569/569), 596.99 KiB | 329 KiB/s, done. | |
| Resolving deltas: 100% (279/279), done. | |
| Submodule path 'libs/PHPTestCase': checked out 'f31a2fafe387292feee1259c35f04268c1e4ffb9' | |
| rdpanek:Eshop radimdanielpanek$ ls libs/PHPTestCase/ | |
| .git framework/ readme.md | |
| composer.json netterobots.txt skeleton/ | |
| rdpanek:Eshop radimdanielpanek$ ls libs/PHPTestCase/ | |
| .git framework/ readme.md | |
| composer.json netterobots.txt skeleton/ | |
| rdpanek:Eshop radimdanielpanek$ ls libs/PHPTestCase/ | |
| rdpanek:Eshop radimdanielpanek$ git clone https://github.com/DeveloperHub/Eshop.git | |
| rdpanek:Eshop radimdanielpanek$ cd libs/PHPTestCase/ | |
| rdpanek:PHPTestCase radimdanielpanek$ git status | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| rdpanek:PHPTestCase radimdanielpanek$ git branch | |
| * (no branch) | |
| master | |
| rdpanek:PHPTestCase radimdanielpanek$ git checkout master | |
| Switched to branch 'master' | |
| rdpanek:PHPTestCase radimdanielpanek$ git status | |
| # On branch master | |
| nothing to commit (working directory clean) | |
| rdpanek:PHPTestCase radimdanielpanek$ git checkout -b test | |
| Switched to a new branch 'test' | |
| rdpanek:PHPTestCase radimdanielpanek$ touch test | |
| rdpanek:PHPTestCase radimdanielpanek$ git add --all | |
| rdpanek:PHPTestCase radimdanielpanek$ git commit -m "added test" | |
| [test 54d47cc] added test | |
| 0 files changed | |
| create mode 100644 test | |
| rdpanek:PHPTestCase radimdanielpanek$ git branch | |
| master | |
| * test | |
| rdpanek:PHPTestCase radimdanielpanek$ cd ../ | |
| rdpanek:libs radimdanielpanek$ git status | |
| # On branch master | |
| # 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: PHPTestCase (new commits) | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| rdpanek:libs radimdanielpanek$ git add --al | |
| rdpanek:libs radimdanielpanek$ git add --all | |
| rdpanek:libs radimdanielpanek$ git status | |
| # On branch master | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: PHPTestCase | |
| # | |
| rdpanek:libs radimdanielpanek$ git commit -m "PHPTestCase modified" | |
| [master 28d4a1f] PHPTestCase modified | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| rdpanek:libs radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 1 commit. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:libs radimdanielpanek$ git submodule add https://github.com/DeveloperHub/PHPTestCase.git libs/PHPTestCase | |
| rdpanek:libs radimdanielpanek$ git submodule add https://github.com/nette/nette.git libs/nette | |
| You need to run this command from the toplevel of the working tree. | |
| rdpanek:libs radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop/libs | |
| rdpanek:libs radimdanielpanek$ cd ../ | |
| rdpanek:Eshop radimdanielpanek$ git submodule add https://github.com/nette/nette.git libs/nette | |
| Cloning into 'libs/nette'... | |
| remote: Counting objects: 44648, done. | |
| remote: Compressing objects: 100% (10463/10463), done. | |
| remote: Total 44648 (delta 35579), reused 42496 (delta 33764) | |
| Receiving objects: 100% (44648/44648), 6.08 MiB | 286 KiB/s, done. | |
| Resolving deltas: 100% (35579/35579), done. | |
| rdpanek:Eshop radimdanielpanek$ cd libs/ | |
| PHPTestCase/ nette/ | |
| rdpanek:Eshop radimdanielpanek$ cd libs/nette/ | |
| .git .travis.yml client-side/ license.md tests/ | |
| .gitignore Nette/ composer.json readme.md | |
| rdpanek:Eshop radimdanielpanek$ cd libs/nette/ | |
| rdpanek:nette radimdanielpanek$ ls -la | |
| total 48 | |
| drwxr-xr-x 11 radimdanielpanek staff 374 29 říj 17:50 . | |
| drwxr-xr-x 4 radimdanielpanek staff 136 29 říj 17:50 .. | |
| -rw-r--r-- 1 radimdanielpanek staff 38 29 říj 17:50 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 22 29 říj 17:50 .gitignore | |
| -rw-r--r-- 1 radimdanielpanek staff 699 29 říj 17:50 .travis.yml | |
| drwxr-xr-x 23 radimdanielpanek staff 782 29 říj 17:50 Nette | |
| drwxr-xr-x 3 radimdanielpanek staff 102 29 říj 17:50 client-side | |
| -rw-r--r-- 1 radimdanielpanek staff 1042 29 říj 17:50 composer.json | |
| -rw-r--r-- 1 radimdanielpanek staff 2725 29 říj 17:50 license.md | |
| -rw-r--r-- 1 radimdanielpanek staff 2088 29 říj 17:50 readme.md | |
| drwxr-xr-x 9 radimdanielpanek staff 306 29 říj 17:50 tests | |
| rdpanek:nette radimdanielpanek$ cd ../../ | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ vim .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 1 commit. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: .gitmodules | |
| # new file: libs/nette | |
| # | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| rdpanek:Eshop radimdanielpanek$ git rm .gitmodules | |
| error: '.gitmodules' has changes staged in the index | |
| (use --cached to keep the file, or -f to force removal) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 1 commit. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: .gitmodules | |
| # new file: libs/nette | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commmit -m "nette addded" | |
| git: 'commmit' is not a git command. See 'git --help'. | |
| Did you mean this? | |
| commit | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "nette addded" | |
| [master 7c4b9eb] nette addded | |
| 2 files changed, 4 insertions(+) | |
| create mode 160000 libs/nette | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 2 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git rm .gitmodules | |
| rm '.gitmodules' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 2 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # deleted: .gitmodules | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git reset --hard HEAD | |
| HEAD is now at 7c4b9eb nette addded | |
| rdpanek:Eshop radimdanielpanek$ git rm --cached .gitmodules | |
| rm '.gitmodules' | |
| rdpanek:Eshop radimdanielpanek$ vim libs/PHPTestCase/ | |
| rdpanek:Eshop radimdanielpanek$ git rm libs/PHPTestCase/ | |
| fatal: pathspec 'libs/PHPTestCase/' did not match any files | |
| rdpanek:Eshop radimdanielpanek$ ls libs/ | |
| PHPTestCase/ nette/ | |
| rdpanek:Eshop radimdanielpanek$ ls libs/ | |
| rdpanek:Eshop radimdanielpanek$ rm -rf libs/PHPTestCase/ | |
| rdpanek:Eshop radimdanielpanek$ rm -rf libs/nette/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/config | |
| rdpanek:Eshop radimdanielpanek$ git submodule status | |
| -54d47cced938ba6b1a9607322ffdbaff128070d3 libs/PHPTestCase | |
| -f77872f134fdd795d9b790f9a85cbb2528943844 libs/nette | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 2 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # deleted: .gitmodules | |
| # | |
| # Changes not staged for commit: | |
| # (use "git add/rm <file>..." to update what will be committed) | |
| # (use "git checkout -- <file>..." to discard changes in working directory) | |
| # | |
| # deleted: libs/PHPTestCase | |
| # deleted: libs/nette | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 2 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # deleted: libs/PHPTestCase | |
| # deleted: libs/nette | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "submodules deleted" | |
| [master 01334d8] submodules deleted | |
| 2 files changed, 2 deletions(-) | |
| delete mode 160000 libs/PHPTestCase | |
| delete mode 160000 libs/nette | |
| rdpanek:Eshop radimdanielpanek$ git statu | |
| git: 'statu' is not a git command. See 'git --help'. | |
| Did you mean one of these? | |
| status | |
| stage | |
| stash | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 3 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git submodule status | |
| rdpanek:Eshop radimdanielpanek$ git submodule status | |
| rdpanek:Eshop radimdanielpanek$ ls .git | |
| .git/ .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ ls .git | |
| .git/ .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ ls .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ packed-refs | |
| HEAD config index modules/ refs/ | |
| ORIG_HEAD description info/ objects/ | |
| rdpanek:Eshop radimdanielpanek$ ls .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ packed-refs | |
| HEAD config index modules/ refs/ | |
| ORIG_HEAD description info/ objects/ | |
| rdpanek:Eshop radimdanielpanek$ ls .git/hooks/ | |
| applypatch-msg.sample pre-applypatch.sample prepare-commit-msg.sample | |
| commit-msg.sample pre-commit.sample update.sample | |
| post-update.sample pre-rebase.sample | |
| rdpanek:Eshop radimdanielpanek$ ls .git/hooks/ | |
| applypatch-msg.sample pre-commit.sample | |
| commit-msg.sample pre-rebase.sample | |
| post-update.sample prepare-commit-msg.sample | |
| pre-applypatch.sample update.sample | |
| rdpanek:Eshop radimdanielpanek$ cd .git/hooks/ | |
| rdpanek:hooks radimdanielpanek$ ls -la | |
| total 72 | |
| drwxr-xr-x 10 radimdanielpanek staff 340 29 říj 17:43 . | |
| drwxr-xr-x 16 radimdanielpanek staff 544 29 říj 18:00 .. | |
| -rwxr-xr-x 1 radimdanielpanek staff 452 29 říj 17:43 applypatch-msg.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 896 29 říj 17:43 commit-msg.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 189 29 říj 17:43 post-update.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 398 29 říj 17:43 pre-applypatch.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 1704 29 říj 17:43 pre-commit.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 4951 29 říj 17:43 pre-rebase.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 1239 29 říj 17:43 prepare-commit-msg.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 3611 29 říj 17:43 update.sample | |
| rdpanek:hooks radimdanielpanek$ vim pre-commit.sample | |
| rdpanek:hooks radimdanielpanek$ vf /Volumes/HTDOCS/PHPTestCase/ | |
| .git/ framework/ readme.md | |
| composer.json netterobots.txt skeleton/ | |
| rdpanek:hooks radimdanielpanek$ vf /Volumes/HTDOCS/PHPTestCase/framework/ | |
| Hooks/ PHPUnit/ Selenium/ | |
| rdpanek:hooks radimdanielpanek$ vf /Volumes/HTDOCS/PHPTestCase/framework/Hooks/ | |
| HookTest.php pre-commit pre-commit.php | |
| rdpanek:hooks radimdanielpanek$ vim /Volumes/HTDOCS/PHPTestCase/framework/Hooks/pre-commit | |
| rdpanek:hooks radimdanielpanek$ vim /Volumes/HTDOCS/PHPTestCase/framework/Hooks/ | |
| HookTest.php pre-commit pre-commit.php | |
| rdpanek:hooks radimdanielpanek$ vim /Volumes/HTDOCS/PHPTestCase/framework/Hooks/pre-commit.php | |
| rdpanek:hooks radimdanielpanek$ vim /Volumes/HTDOCS/PHPTestCase/framework/Hooks/pre-commit | |
| rdpanek:hooks radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop/.git/hooks | |
| rdpanek:hooks radimdanielpanek$ ls -la | |
| total 72 | |
| drwxr-xr-x 10 radimdanielpanek staff 340 29 říj 18:04 . | |
| drwxr-xr-x 16 radimdanielpanek staff 544 29 říj 18:00 .. | |
| -rwxr-xr-x 1 radimdanielpanek staff 452 29 říj 17:43 applypatch-msg.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 896 29 říj 17:43 commit-msg.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 189 29 říj 17:43 post-update.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 398 29 říj 17:43 pre-applypatch.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 1704 29 říj 17:43 pre-commit.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 4951 29 říj 17:43 pre-rebase.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 1239 29 říj 17:43 prepare-commit-msg.sample | |
| -rwxr-xr-x 1 radimdanielpanek staff 3611 29 říj 17:43 update.sample | |
| rdpanek:hooks radimdanielpanek$ git status | |
| fatal: This operation must be run in a work tree | |
| rdpanek:hooks radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop/.git/hooks | |
| rdpanek:hooks radimdanielpanek$ cd ../../ | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 3 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ find .git/objects/ -type f | |
| .git/objects//01/334d8cdd655c1991dc8324b4bcbbbaac52adbe | |
| .git/objects//09/d620398c9647e9edf030616930fb2e33cb4d17 | |
| .git/objects//28/d4a1fa12844ecefba30def25b66329d2a5ef28 | |
| .git/objects//53/3d1c343519962e71138fd6e25887124367b85f | |
| .git/objects//54/f88b4b5cac28aeddda2ea7d12019542925d5d4 | |
| .git/objects//7c/4b9eb60579048ee68b7075908b6cdf909745c3 | |
| .git/objects//cc/d19b9f00257bc5decba1e75085f4ebfb604100 | |
| .git/objects//dc/18a89e5db3b374d3dfc7760d49f122593caa6c | |
| .git/objects//fc/f9fe7de4ce0f93665236663f650ff74c20520b | |
| .git/objects//pack/pack-1b24e53f20618ff00836c047817fb889cc3d83cf.idx | |
| .git/objects//pack/pack-1b24e53f20618ff00836c047817fb889cc3d83cf.pack | |
| rdpanek:Eshop radimdanielpanek$ git log --pretty=oneline --graph --branches | |
| * 01334d8cdd655c1991dc8324b4bcbbbaac52adbe submodules deleted | |
| * 7c4b9eb60579048ee68b7075908b6cdf909745c3 nette addded | |
| * 28d4a1fa12844ecefba30def25b66329d2a5ef28 PHPTestCase modified | |
| * 3561dbf8a88fa3bf57e482f82600494fd21d1806 PHPTestCase: added | |
| * 85f364c28e5ddc1dbcde6bf0737e030077513a98 Initial commit | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -t 01334d8cdd655c1991dc8324b4bcbbbaac52adbe | |
| commit | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -p 01334d8cdd655c1991dc8324b4bcbbbaac52adbe | |
| tree dc18a89e5db3b374d3dfc7760d49f122593caa6c | |
| parent 7c4b9eb60579048ee68b7075908b6cdf909745c3 | |
| author Dan <[email protected]> 1351530052 +0100 | |
| committer Dan <[email protected]> 1351530052 +0100 | |
| submodules deleted | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -t dc18a89e5db3b374d3dfc7760d49f122593caa6c | |
| tree | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -p dc18a89e5db3b374d3dfc7760d49f122593caa6c | |
| 100644 blob ccd19b9f00257bc5decba1e75085f4ebfb604100 .gitmodules | |
| 100644 blob a92a27376f27cec7d0107c047d9da71cfccffb2b README.md | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -t ccd19b9f00257bc5decba1e75085f4ebfb604100 | |
| blob | |
| rdpanek:Eshop radimdanielpanek$ git cat-file -p ccd19b9f00257bc5decba1e75085f4ebfb604100 | |
| [submodule "libs/PHPTestCase"] | |
| path = libs/PHPTestCase | |
| url = https://github.com/DeveloperHub/PHPTestCase.git | |
| [submodule "libs/nette"] | |
| path = libs/nette | |
| url = https://github.com/nette/nette.git | |
| rdpanek:Eshop radimdanielpanek$ find .git/objects/ -type f | |
| .git/objects//01/334d8cdd655c1991dc8324b4bcbbbaac52adbe | |
| .git/objects//09/d620398c9647e9edf030616930fb2e33cb4d17 | |
| .git/objects//28/d4a1fa12844ecefba30def25b66329d2a5ef28 | |
| .git/objects//53/3d1c343519962e71138fd6e25887124367b85f | |
| .git/objects//54/f88b4b5cac28aeddda2ea7d12019542925d5d4 | |
| .git/objects//7c/4b9eb60579048ee68b7075908b6cdf909745c3 | |
| .git/objects//cc/d19b9f00257bc5decba1e75085f4ebfb604100 | |
| .git/objects//dc/18a89e5db3b374d3dfc7760d49f122593caa6c | |
| .git/objects//fc/f9fe7de4ce0f93665236663f650ff74c20520b | |
| .git/objects//pack/pack-1b24e53f20618ff00836c047817fb889cc3d83cf.idx | |
| .git/objects//pack/pack-1b24e53f20618ff00836c047817fb889cc3d83cf.pack | |
| rdpanek:Eshop radimdanielpanek$ git gc | |
| Counting objects: 555, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (266/266), done. | |
| Writing objects: 100% (555/555), done. | |
| Total 555 (delta 271), reused 544 (delta 268) | |
| rdpanek:Eshop radimdanielpanek$ find .git/objects/ -type f | |
| .git/objects//info/packs | |
| .git/objects//pack/pack-ebf0f31e0b05064748b7123e4e550bfe41ebe0b1.idx | |
| .git/objects//pack/pack-ebf0f31e0b05064748b7123e4e550bfe41ebe0b1.pack | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ packed-refs | |
| HEAD config index modules/ refs/ | |
| ORIG_HEAD description info/ objects/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/logs/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/logs/ | |
| HEAD refs/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/logs/HEAD | |
| rdpanek:Eshop radimdanielpanek$ vim .git/logs/ | |
| HEAD refs/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/logs/refs/ | |
| heads/ remotes/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/logs/refs/heads/master | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ packed-refs | |
| HEAD config index modules/ refs/ | |
| ORIG_HEAD description info/ objects/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/ | |
| heads/ remotes/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/remotes/origin/HEAD | |
| .git/ .gitmodules README.md libs/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/remotes/origin/HEAD | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/ | |
| heads/ remotes/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/tags/ | |
| rdpanek:Eshop radimdanielpanek$ | |
| Display all 1902 possibilities? (y or n) | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/tags/ | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git branch -a | |
| * master | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/US1234 | |
| remotes/origin/develop | |
| remotes/origin/master | |
| rdpanek:Eshop radimdanielpanek$ git tag | |
| v1.0.0 | |
| v1.1.0 | |
| v3 | |
| v4 | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ packed-refs | |
| HEAD config index modules/ refs/ | |
| ORIG_HEAD description info/ objects/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ packed-refs | |
| HEAD config index modules/ refs/ | |
| ORIG_HEAD description info/ objects/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/ | |
| heads/ remotes/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ ls .git/refs/tags/ | |
| rdpanek:Eshop radimdanielpanek$ cd ../../../ | |
| rdpanek:Volumes radimdanielpanek$ git status | |
| fatal: Not a git repository (or any of the parent directories): .git | |
| rdpanek:Volumes radimdanielpanek$ pwd | |
| /Volumes | |
| rdpanek:Volumes radimdanielpanek$ cd /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 3 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ ls | |
| README.md libs | |
| rdpanek:Eshop radimdanielpanek$ git tag | |
| v1.0.0 | |
| v1.1.0 | |
| v3 | |
| v4 | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ vim .git | |
| .git/ .gitmodules | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ packed-refs | |
| HEAD config index modules/ refs/ | |
| ORIG_HEAD description info/ objects/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/packed-refs | |
| .git/ .gitmodules README.md libs/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/packed-refs | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git tag | |
| v1.0.0 | |
| v1.1.0 | |
| v3 | |
| v4 | |
| rdpanek:Eshop radimdanielpanek$ vim .git/refs/ | |
| heads/ remotes/ tags/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/ | |
| COMMIT_EDITMSG branches/ hooks/ logs/ packed-refs | |
| HEAD config index modules/ refs/ | |
| ORIG_HEAD description info/ objects/ | |
| rdpanek:Eshop radimdanielpanek$ vim .git/packed-refs | |
| rdpanek:Eshop radimdanielpanek$ git reflog | |
| 01334d8 HEAD@{0}: commit: submodules deleted | |
| 7c4b9eb HEAD@{1}: commit: nette addded | |
| 28d4a1f HEAD@{2}: commit: PHPTestCase modified | |
| 3561dbf HEAD@{3}: clone: from https://github.com/DeveloperHub/Eshop.git | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 3 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ pwd | |
| /Volumes/HTDOCS/temp/Eshop | |
| rdpanek:Eshop radimdanielpanek$ cp /Volumes/HTDOCS/selenium-server-standalone-2.25.0.jar . | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 3 commits. | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # selenium-server-standalone-2.25.0.jar | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "selenium rc: added" | |
| [master 7d17116] selenium rc: added | |
| 1 file changed, 0 insertions(+), 0 deletions(-) | |
| create mode 100644 selenium-server-standalone-2.25.0.jar | |
| rdpanek:Eshop radimdanielpanek$ cd ../ | |
| rdpanek:temp radimdanielpanek$ ls -lah | |
| total 16 | |
| drwxrwxrwx 8 radimdanielpanek staff 272B 29 říj 17:43 . | |
| drwxr-xr-x@ 44 radimdanielpanek staff 1,5K 24 říj 11:12 .. | |
| -rw-r--r--@ 1 radimdanielpanek staff 6,0K 5 říj 10:59 .DS_Store | |
| drwxr-xr-x 7 radimdanielpanek staff 238B 29 říj 18:18 Eshop | |
| drwxr-xr-x 6 radimdanielpanek staff 204B 27 říj 13:51 Eshop2 | |
| drwxr-xr-x 8 radimdanielpanek staff 272B 29 říj 10:12 PHPTestCase | |
| drwxrwxrwx 6 radimdanielpanek staff 204B 26 říj 14:29 side | |
| drwxr-xr-x 8 radimdanielpanek staff 272B 18 říj 23:46 test | |
| rdpanek:temp radimdanielpanek$ cd Eshop | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 63368 | |
| drwxr-xr-x 7 radimdanielpanek staff 238 29 říj 18:18 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 17:43 .. | |
| drwxr-xr-x 16 radimdanielpanek staff 544 29 říj 18:19 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 197 29 říj 17:58 .gitmodules | |
| -rw-r--r-- 1 radimdanielpanek staff 18 29 říj 17:43 README.md | |
| drwxr-xr-x 2 radimdanielpanek staff 68 29 říj 18:00 libs | |
| -rw-r--r--@ 1 radimdanielpanek staff 32435303 29 říj 18:18 selenium-server-standalone-2.25.0.jar | |
| rdpanek:Eshop radimdanielpanek$ rm -rf selenium-server-standalone-2.25.0.jar | |
| rdpanek:Eshop radimdanielpanek$ git add --alll | |
| error: unknown option `alll' | |
| usage: git add [options] [--] <filepattern>... | |
| -n, --dry-run dry run | |
| -v, --verbose be verbose | |
| -i, --interactive interactive picking | |
| -p, --patch select hunks interactively | |
| -e, --edit edit current diff and apply | |
| -f, --force allow adding otherwise ignored files | |
| -u, --update update tracked files | |
| -N, --intent-to-add record only the fact that the path will be added later | |
| -A, --all add changes from all tracked and untracked files | |
| --refresh don't add, only refresh the index | |
| --ignore-errors just skip files which cannot be added because of errors | |
| --ignore-missing check if - even missing - files are ignored in dry run | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "sel delete" | |
| [master b9e84dc] sel delete | |
| 1 file changed, 0 insertions(+), 0 deletions(-) | |
| delete mode 100644 selenium-server-standalone-2.25.0.jar | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 5 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ ls -la | |
| total 16 | |
| drwxr-xr-x 6 radimdanielpanek staff 204 29 říj 18:20 . | |
| drwxrwxrwx 8 radimdanielpanek staff 272 29 říj 17:43 .. | |
| drwxr-xr-x 16 radimdanielpanek staff 544 29 říj 18:20 .git | |
| -rw-r--r-- 1 radimdanielpanek staff 197 29 říj 17:58 .gitmodules | |
| -rw-r--r-- 1 radimdanielpanek staff 18 29 říj 17:43 README.md | |
| drwxr-xr-x 2 radimdanielpanek staff 68 29 říj 18:00 libs | |
| rdpanek:Eshop radimdanielpanek$ git filter-branch --index-filter 'git rm --cached --ignore-unmatch selenium-server-standalone-2.25.0.jar' | |
| Rewrite 7d1711658f1ff2e2368aa3b1df3bc6ceebef60e3 (6/7)rm 'selenium-server-standalone-2.25.0.jar' | |
| Rewrite b9e84dc9fea3e77e695d7e4b2cc743a889d9796a (7/7) | |
| Ref 'refs/heads/master' was rewritten | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 5 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 5 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 5 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ touch letadlo | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git statu | |
| git: 'statu' is not a git command. See 'git --help'. | |
| Did you mean one of these? | |
| status | |
| stage | |
| stash | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 5 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: letadlo | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "letadlo" | |
| [master 7a498cb] letadlo | |
| 0 files changed | |
| create mode 100644 letadlo | |
| rdpanek:Eshop radimdanielpanek$ vim letadlo | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * master | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b develop | |
| M letadlo | |
| Switched to a new branch 'develop' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: letadlo | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git branch | |
| * develop | |
| master | |
| rdpanek:Eshop radimdanielpanek$ git checkout | |
| rdpanek:Eshop radimdanielpanek$ touch auto | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch develop | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: auto | |
| # modified: letadlo | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git checkout master | |
| A auto | |
| M letadlo | |
| Switched to branch 'master' | |
| Your branch is ahead of 'origin/master' by 6 commits. | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 6 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: auto | |
| # modified: letadlo | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git stash | |
| Saved working directory and index state WIP on master: 7a498cb letadlo | |
| HEAD is now at 7a498cb letadlo | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 6 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 6 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git stash --list | |
| error: unknown option for 'stash save': --list | |
| To provide a message, use git stash save -- '--list' | |
| 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 clear | |
| rdpanek:Eshop radimdanielpanek$ git stash list | |
| stash@{0}: WIP on master: 7a498cb letadlo | |
| rdpanek:Eshop radimdanielpanek$ git stash apply | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 6 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: auto | |
| # | |
| # 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: letadlo | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 6 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: auto | |
| # | |
| # 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: letadlo | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git stash | |
| Saved working directory and index state WIP on master: 7a498cb letadlo | |
| HEAD is now at 7a498cb letadlo | |
| rdpanek:Eshop radimdanielpanek$ git stash list | |
| stash@{0}: WIP on master: 7a498cb letadlo | |
| stash@{1}: WIP on master: 7a498cb letadlo | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 6 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git stash apply stash@{1} | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 6 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: auto | |
| # | |
| # 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: letadlo | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git stash list | |
| stash@{0}: WIP on master: 7a498cb letadlo | |
| stash@{1}: WIP on master: 7a498cb letadlo | |
| rdpanek:Eshop radimdanielpanek$ git stash po | |
| 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 clear | |
| rdpanek:Eshop radimdanielpanek$ git stash pop | |
| error: Your local changes to the following files would be overwritten by merge: | |
| letadlo | |
| Please, commit your changes or stash them before you can merge. | |
| Aborting | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 6 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: auto | |
| # | |
| # 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: letadlo | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "zmeny" | |
| [master 9f8fa03] zmeny | |
| 1 file changed, 1 insertion(+) | |
| create mode 100644 auto | |
| rdpanek:Eshop radimdanielpanek$ git stash pop | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 7 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| Dropped refs/stash@{0} (01fc79eecdf341f24a480032219d822e31f21b02) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 7 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 7 commits. | |
| # | |
| nothing to commit (working directory clean) | |
| rdpanek:Eshop radimdanielpanek$ touch auot | |
| rdpanek:Eshop radimdanielpanek$ git stash | |
| No local changes to save | |
| rdpanek:Eshop radimdanielpanek$ git add --all | |
| rdpanek:Eshop radimdanielpanek$ git stash | |
| Saved working directory and index state WIP on master: 9f8fa03 zmeny | |
| HEAD is now at 9f8fa03 zmeny | |
| rdpanek:Eshop radimdanielpanek$ git stash list | |
| stash@{0}: WIP on master: 9f8fa03 zmeny | |
| stash@{1}: WIP on master: 7a498cb letadlo | |
| rdpanek:Eshop radimdanielpanek$ git stash apply stash@{0} | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 7 commits. | |
| # | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: auot | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git stash list | |
| stash@{0}: WIP on master: 9f8fa03 zmeny | |
| stash@{1}: WIP on master: 7a498cb letadlo | |
| rdpanek:Eshop radimdanielpanek$ git checkout -b stash stash@{1} | |
| A auot | |
| Switched to a new branch 'stash' | |
| rdpanek:Eshop radimdanielpanek$ git status | |
| # On branch stash | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # new file: auot | |
| # | |
| rdpanek:Eshop radimdanielpanek$ git commit -m "auto" | |
| [stash 61c5f5d] auto | |
| 0 files changed | |
| create mode 100644 auot |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment