diff --git a/ende/1_end.md b/ende/1_end.md index 3a130ae..dee6a87 100644 --- a/ende/1_end.md +++ b/ende/1_end.md @@ -14,3 +14,4 @@ * * * +* diff --git a/first_steps/2_git_dir.md b/first_steps/2_git_dir.md index f3a2c5c..cc66174 100644 --- a/first_steps/2_git_dir.md +++ b/first_steps/2_git_dir.md @@ -40,6 +40,25 @@ cia = commit -am lol = log --oneline --graph --decorate +!SLIDE command smallest + + $ tree .git + .git + ├── branches + ├── config + ├── description + ├── HEAD + ├── hooks + │   └── [...] + ├── info + │   └── exclude + ├── objects + │   ├── info + │   └── pack + └── refs + ├── heads + └── tags + !SLIDE bullets incremental # objects @@ -48,6 +67,25 @@ * benannt nach der SHA1 * ` 32/09658ac8d80bc9726d3a33d77e3dfc5fe6035e` +!SLIDE command smallest + + $ tree .git + .git + ├── branches + ├── config + ├── description + ├── HEAD + ├── hooks + │   └── [...] + ├── info + │   └── exclude + ├── objects + │   ├── info + │   └── pack + └── refs + ├── heads + └── tags + !SLIDE bullets incremental # refs diff --git a/first_steps/4_demo.md b/first_steps/4_demo.md index a637e14..1cd4f5c 100644 --- a/first_steps/4_demo.md +++ b/first_steps/4_demo.md @@ -1,7 +1,7 @@ !SLIDE commandline incremental $ git init ctdo-projekt - Initialized empty Git repository in /ctdo-projekt/.git/ + Initialized empty Git repository in ~/ctdo-projekt/.git/ $ cd ctdo-projekt !SLIDE commandline incremental @@ -86,7 +86,7 @@ !SLIDE commandline incremental - $ echo "from ctdo" >> README + $ echo "© ctdo" >> README $ git status # On branch master # Changes not staged for commit: @@ -102,7 +102,7 @@ !SLIDE commandline - $ echo "from ctdo" >> README + $ echo "© ctdo" >> README $ git status # On branch master # Changes not staged for commit: @@ -119,6 +119,18 @@ !SLIDE commandline incremental $ git add README + $ git diff --cached + diff --git c/README w/README + index d00491f..446a974 100644 + --- c/README + +++ w/README + @@ -1 +1,2 @@ + Hello world + +© ctdo + + +!SLIDE commandline incremental + $ git commit -m 'added info' [master bdc13db] added info 1 files changed, 1 insertions(+), 0 deletions(-) @@ -148,4 +160,4 @@ +++ w/README @@ -1 +1,2 @@ Hello world - +from ctdo + +© ctdo diff --git a/first_steps/7_remotes.md b/first_steps/7_remotes.md index bb59e5a..41a35d6 100644 --- a/first_steps/7_remotes.md +++ b/first_steps/7_remotes.md @@ -46,4 +46,6 @@ $ git push origin master:master + # remote Branch löschen $ git push origin :master + diff --git a/first_steps/8_end.md b/first_steps/8_end.md index 6b3bb2c..ec0b8f7 100644 --- a/first_steps/8_end.md +++ b/first_steps/8_end.md @@ -18,3 +18,331 @@ !SLIDE center # 12 Kommandos. + +!SLIDE small + +add | +add--interactive | +am | +annotate | +apply | +archimport | +archive | +bisect | +bisect--helper | +blame | +branch | +bundle | +cat-file | +check-attr | +checkout | +checkout-index | +check-ref-format | +cherry | +cherry-pick | +citool | +clean | +clone | +commit | +commit-tree | +config | +count-objects | +credential-cache | +credential-cache--daemon | +credential-store | +cvsexportcommit | +cvsimport | +cvsserver | +daemon | +describe | +diff | +diff-files | +diff-index | +difftool | +difftool--helper | +diff-tree | +fast-export | +fast-import | +fetch | +fetch-pack | +filter-branch | +fmt-merge-msg | +for-each-ref | +format-patch | +fsck | +fsck-objects | +gc | +get-tar-commit-id | +grep | +gui | +gui--askpass | +hash-object | +help | +http-backend | +http-fetch | +http-push | +imap-send | +index-pack | +init | +init-db | +instaweb | +log | +lost-found | +ls-files | +ls-remote | +ls-tree | +mailinfo | +mailsplit | +merge | +merge-base | +merge-file | +merge-index | +merge-octopus | +merge-one-file | +merge-ours | +merge-recursive | +merge-resolve | +merge-subtree | +mergetool | +mergetool--lib | +merge-tree | +mktag | +mktree | +mv | +name-rev | +notes | +pack-objects | +pack-redundant | +pack-refs | +parse-remote | +patch-id | +peek-remote | +prune | +prune-packed | +pull | +push | +quiltimport | +read-tree | +rebase | +rebase--am | +rebase--interactive | +rebase--merge | +receive-pack | +reflog | +relink | +remote | +remote-ext | +remote-fd | +remote-ftp | +remote-ftps | +remote-http | +remote-https | +remote-testgit | +repack | +replace | +repo-config | +request-pull | +rerere | +reset | +revert | +rev-list | +rev-parse | +rm | +send-email | +send-pack | +shell | +sh-i18n | +sh-i18n--envsubst | +shortlog | +show | +show-branch | +show-index | +show-ref | +sh-setup | +stage | +stash | +status | +stripspace | +submodule | +svn | +symbolic-ref | +tag | +tar-tree | +unpack-file | +unpack-objects | +update-index | +update-ref | +update-server-info | +upload-archive | +upload-pack | +var | +verify-pack | +verify-tag | +web--browse | +whatchanged | +write-tree + +!SLIDE small allcommands + +add | +add--interactive | +am | +annotate | +apply | +archimport | +archive | +bisect | +bisect--helper | +blame | +branch | +bundle | +cat-file | +check-attr | +checkout | +checkout-index | +check-ref-format | +cherry | +cherry-pick | +citool | +clean | +clone | +commit | +commit-tree | +config | +count-objects | +credential-cache | +credential-cache--daemon | +credential-store | +cvsexportcommit | +cvsimport | +cvsserver | +daemon | +describe | +diff | +diff-files | +diff-index | +difftool | +difftool--helper | +diff-tree | +fast-export | +fast-import | +fetch | +fetch-pack | +filter-branch | +fmt-merge-msg | +for-each-ref | +format-patch | +fsck | +fsck-objects | +gc | +get-tar-commit-id | +grep | +gui | +gui--askpass | +hash-object | +help | +http-backend | +http-fetch | +http-push | +imap-send | +index-pack | +init | +init-db | +instaweb | +log | +lost-found | +ls-files | +ls-remote | +ls-tree | +mailinfo | +mailsplit | +merge | +merge-base | +merge-file | +merge-index | +merge-octopus | +merge-one-file | +merge-ours | +merge-recursive | +merge-resolve | +merge-subtree | +mergetool | +mergetool--lib | +merge-tree | +mktag | +mktree | +mv | +name-rev | +notes | +pack-objects | +pack-redundant | +pack-refs | +parse-remote | +patch-id | +peek-remote | +prune | +prune-packed | +pull | +push | +quiltimport | +read-tree | +rebase | +rebase--am | +rebase--interactive | +rebase--merge | +receive-pack | +reflog | +relink | +remote | +remote-ext | +remote-fd | +remote-ftp | +remote-ftps | +remote-http | +remote-https | +remote-testgit | +repack | +replace | +repo-config | +request-pull | +rerere | +reset | +revert | +rev-list | +rev-parse | +rm | +send-email | +send-pack | +shell | +sh-i18n | +sh-i18n--envsubst | +shortlog | +show | +show-branch | +show-index | +show-ref | +sh-setup | +stage | +stash | +status | +stripspace | +submodule | +svn | +symbolic-ref | +tag | +tar-tree | +unpack-file | +unpack-objects | +update-index | +update-ref | +update-server-info | +upload-archive | +upload-pack | +var | +verify-pack | +verify-tag | +web--browse | +whatchanged | +write-tree + +# 160 diff --git a/first_steps/commands.txt b/first_steps/commands.txt new file mode 100644 index 0000000..f390bdc --- /dev/null +++ b/first_steps/commands.txt @@ -0,0 +1,160 @@ +git-add +git-add--interactive +git-am +git-annotate +git-apply +git-archimport +git-archive +git-bisect +git-bisect--helper +git-blame +git-branch +git-bundle +git-cat-file +git-check-attr +git-checkout +git-checkout-index +git-check-ref-format +git-cherry +git-cherry-pick +git-citool +git-clean +git-clone +git-commit +git-commit-tree +git-config +git-count-objects +git-credential-cache +git-credential-cache--daemon +git-credential-store +git-cvsexportcommit +git-cvsimport +git-cvsserver +git-daemon +git-describe +git-diff +git-diff-files +git-diff-index +git-difftool +git-difftool--helper +git-diff-tree +git-fast-export +git-fast-import +git-fetch +git-fetch-pack +git-filter-branch +git-fmt-merge-msg +git-for-each-ref +git-format-patch +git-fsck +git-fsck-objects +git-gc +git-get-tar-commit-id +git-grep +git-gui +git-gui--askpass +git-hash-object +git-help +git-http-backend +git-http-fetch +git-http-push +git-imap-send +git-index-pack +git-init +git-init-db +git-instaweb +git-log +git-lost-found +git-ls-files +git-ls-remote +git-ls-tree +git-mailinfo +git-mailsplit +git-merge +git-merge-base +git-merge-file +git-merge-index +git-merge-octopus +git-merge-one-file +git-merge-ours +git-merge-recursive +git-merge-resolve +git-merge-subtree +git-mergetool +git-mergetool--lib +git-merge-tree +git-mktag +git-mktree +git-mv +git-name-rev +git-notes +git-pack-objects +git-pack-redundant +git-pack-refs +git-parse-remote +git-patch-id +git-peek-remote +git-prune +git-prune-packed +git-pull +git-push +git-quiltimport +git-read-tree +git-rebase +git-rebase--am +git-rebase--interactive +git-rebase--merge +git-receive-pack +git-reflog +git-relink +git-remote +git-remote-ext +git-remote-fd +git-remote-ftp +git-remote-ftps +git-remote-http +git-remote-https +git-remote-testgit +git-repack +git-replace +git-repo-config +git-request-pull +git-rerere +git-reset +git-revert +git-rev-list +git-rev-parse +git-rm +git-send-email +git-send-pack +git-shell +git-sh-i18n +git-sh-i18n--envsubst +git-shortlog +git-show +git-show-branch +git-show-index +git-show-ref +git-sh-setup +git-stage +git-stash +git-status +git-stripspace +git-submodule +git-svn +git-symbolic-ref +git-tag +git-tar-tree +git-unpack-file +git-unpack-objects +git-update-index +git-update-ref +git-update-server-info +git-upload-archive +git-upload-pack +git-var +git-verify-pack +git-verify-tag +git-web--browse +git-whatchanged +git-write-tree diff --git a/intro/1_intro.md b/intro/1_intro.md index a365edc..eb27870 100644 --- a/intro/1_intro.md +++ b/intro/1_intro.md @@ -13,9 +13,6 @@ __© git-scm.com__ # Git is an open source, distributed version control system designed for speed and efficiency -!SLIDE center -![Linus Torvalds](Linus_Torvalds.jpg) - !SLIDE # verteilt @@ -54,5 +51,5 @@ __© git-scm.com__ * Diff * durch die History blättern * Änderungen committen -* verschieden Revisionen auschecken +* verschiedene Revisionen auschecken * Branching diff --git a/style.css b/style.css index d4b5c9d..d69b2d4 100644 --- a/style.css +++ b/style.css @@ -35,3 +35,12 @@ pre, code { font-family: 'Inconsolata', monospace; } padding-left: 0; } .cmdlist ul li { padding: 10px; } + +.allcommands h1 { + position: absolute; + left: 250px; + top: 150px; + color: red; + font-size: 20em; + text-shadow: 2px 2px 3px #000; +}