Created
November 21, 2017 20:30
-
-
Save tomatohammado/1b2765a1073b6e9b132243f9e1340317 to your computer and use it in GitHub Desktop.
Vestibule Week 2 day 2(7), cookie-clicker lab
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
| GAs-MacBook-Air:~ ga$ cd ga-wdi/fundamentals/wdi-fundamentals-memorygame/ | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "fixed alert bug (it would pop up before showing the second card face) using setTimeout. Thanks Sandro. So I changed the alerts in the checkForMatch function, and the conditional in flipCard to see if you click the same card more than once." | |
| [master 8f6a565] fixed alert bug (it would pop up before showing the second card face) using setTimeout. Thanks Sandro. So I changed the alerts in the checkForMatch function, and the conditional in flipCard to see if you click the same card more than once. | |
| 1 file changed, 6 insertions(+), 5 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 572 bytes | 572.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| f7ca84d..8f6a565 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ cd .. | |
| GAs-MacBook-Air:fundamentals ga$ ls | |
| World github_resume wdi-fundamentals-memorygame | |
| cell_phone_html_css thinking_like_a_programmer | |
| GAs-MacBook-Air:fundamentals ga$ mkdir cookie_clicker_lab | |
| GAs-MacBook-Air:fundamentals ga$ rmdir cookie_clicker_lab/ | |
| GAs-MacBook-Air:fundamentals ga$ ls | |
| World github_resume wdi-fundamentals-memorygame | |
| cell_phone_html_css thinking_like_a_programmer | |
| GAs-MacBook-Air:fundamentals ga$ rmdir cookie_clicker_lab/ && '$_' | |
| rmdir: cookie_clicker_lab/: No such file or directory | |
| GAs-MacBook-Air:fundamentals ga$ mkdir cookie_clicker_lab && '$_' | |
| -bash: $_: command not found | |
| GAs-MacBook-Air:fundamentals ga$ ls | |
| World cookie_clicker_lab thinking_like_a_programmer | |
| cell_phone_html_css github_resume wdi-fundamentals-memorygame | |
| GAs-MacBook-Air:fundamentals ga$ cd cookie_clicker_lab/ | |
| GAs-MacBook-Air:cookie_clicker_lab ga$ git clone https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| Cloning into 'cookie_clicker'... | |
| remote: Counting objects: 16, done. | |
| remote: Compressing objects: 100% (10/10), done. | |
| remote: Total 16 (delta 1), reused 16 (delta 1), pack-reused 0 | |
| Unpacking objects: 100% (16/16), done. | |
| GAs-MacBook-Air:cookie_clicker_lab ga$ code . | |
| GAs-MacBook-Air:cookie_clicker_lab ga$ cd cookie_clicker/ | |
| GAs-MacBook-Air:cookie_clicker ga$ ls | |
| assets mockup.png readme.md | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ touch index.html | |
| GAs-MacBook-Air:cookie_clicker ga$ mkdir css | |
| GAs-MacBook-Air:cookie_clicker ga$ mkdir js | |
| GAs-MacBook-Air:cookie_clicker ga$ touch css/style.css js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "created blank index.html, css/style.css, and js/main.js files. Time to rock" | |
| [master 36d3881] created blank index.html, css/style.css, and js/main.js files. Time to rock | |
| 3 files changed, 0 insertions(+), 0 deletions(-) | |
| create mode 100644 css/style.css | |
| create mode 100644 index.html | |
| create mode 100644 js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| 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: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add index.html | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "created scaffold for HTML, added link for stylesheet and font from google fonts, and made basic markup for the page. No styles yet. I might have to reasses the markup when doing the bonuses, since I'm not wrapping them in anything, but that'll be for later." | |
| [master 81e4004] created scaffold for HTML, added link for stylesheet and font from google fonts, and made basic markup for the page. No styles yet. I might have to reasses the markup when doing the bonuses, since I'm not wrapping them in anything, but that'll be for later. | |
| 1 file changed, 19 insertions(+) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 8, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (5/5), done. | |
| Writing objects: 100% (8/8), 1.22 KiB | 417.00 KiB/s, done. | |
| Total 8 (delta 1), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (1/1), done. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 7fa9a7c..81e4004 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add index.html | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "fixed path for img src, added .score class to p tag." | |
| [master 4869688] fixed path for img src, added .score class to p tag. | |
| 1 file changed, 2 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git add css/style.css | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "added styles, this is literally all I need for the MVP." | |
| [master 8322c18] added styles, this is literally all I need for the MVP. | |
| 1 file changed, 16 insertions(+) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 7, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (7/7), 832 bytes | 416.00 KiB/s, done. | |
| Total 7 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 81e4004..8322c18 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "changed classes on .score to .score display, made .score-value span around the actual number so I can target just that." | |
| [master 6d6ee13] changed classes on .score to .score display, made .score-value span around the actual number so I can target just that. | |
| 2 files changed, 2 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (5/5), 541 bytes | 541.00 KiB/s, done. | |
| Total 5 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 8322c18..6d6ee13 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "added script for js/main.js, test console.log message to confirm it loaded. So far, so good." | |
| [master b3e8c7b] added script for js/main.js, test console.log message to confirm it loaded. So far, so good. | |
| 2 files changed, 2 insertions(+) | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "changed data-points attribute on .cookie to data-point-value, because I like the name better. Starting event listener on cook, test to see that the value I am getting from the cookie is correct. Sweeeeet." | |
| [master b34c73d] changed data-points attribute on .cookie to data-point-value, because I like the name better. Starting event listener on cook, test to see that the value I am getting from the cookie is correct. Sweeeeet. | |
| 2 files changed, 6 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 10, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (7/7), done. | |
| Writing objects: 100% (10/10), 1.07 KiB | 273.00 KiB/s, done. | |
| Total 10 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 6d6ee13..b34c73d master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "added data-score-total attribute to .score-value so I can accurately get the value, made new scoreTotal variable in event listener to get the currect score value. Tested to see that it works." | |
| [master bc3ad1e] added data-score-total attribute to .score-value so I can accurately get the value, made new scoreTotal variable in event listener to get the currect score value. Tested to see that it works. | |
| 2 files changed, 10 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (5/5), 726 bytes | 726.00 KiB/s, done. | |
| Total 5 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| b34c73d..bc3ad1e master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "so I can get the click to work once, but after that it doesn't do anything new/does the same thing. So this is a good point to commit, and take a closer look." | |
| [master c929536] so I can get the click to work once, but after that it doesn't do anything new/does the same thing. So this is a good point to commit, and take a closer look. | |
| 1 file changed, 13 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 739 bytes | 369.00 KiB/s, done. | |
| Total 4 (delta 1), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (1/1), completed with 1 local object. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| bc3ad1e..c929536 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "silly me, I was setting the data-score-total using this, so it was adding it to the cookie and not that .score-value span. So now it works\! MVP out of the way. I'm going to make a reset button now." | |
| [master 5dc6440] silly me, I was setting the data-score-total using this, so it was adding it to the cookie and not that .score-value span. So now it works\! MVP out of the way. I'm going to make a reset button now. | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 479 bytes | 479.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| c929536..5dc6440 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add index.html | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "added a entity in the .score-display because it's a little more explicit than just having a space there. So I'm done with the MVP in 50 minutes, that's pretty rad." | |
| [master b56bde1] added a entity in the .score-display because it's a little more explicit than just having a space there. So I'm done with the MVP in 50 minutes, that's pretty rad. | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 405 bytes | 405.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 5dc6440..b56bde1 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: css/style.css | |
| modified: index.html | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "added markup for reset button, also created a <main> section around the cookie and the score for organization. Included another google font for the button, added preliminary styles." | |
| [master f7d2403] added markup for reset button, also created a <main> section around the cookie and the score for organization. Included another google font for the button, added preliminary styles. | |
| 2 files changed, 13 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| 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: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add css/style.css | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "more styles to the button, looks decent. Now to add the event listener to reset the score. Fun stuff." | |
| [master f3085f3] more styles to the button, looks decent. Now to add the event listener to reset the score. Fun stuff. | |
| 1 file changed, 7 insertions(+) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 9, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (7/7), done. | |
| Writing objects: 100% (9/9), 1.10 KiB | 281.00 KiB/s, done. | |
| Total 9 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| b56bde1..f3085f3 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "added comments to the current code, makes it much easier to follow. Now to follow the good example in the new reset button event listener." | |
| [master 520c513] added comments to the current code, makes it much easier to follow. Now to follow the good example in the new reset button event listener. | |
| 1 file changed, 17 insertions(+), 6 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 747 bytes | 747.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| f3085f3..520c513 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "added event listener to reset button, it works. Tested with console.log." | |
| [master 70ed91c] added event listener to reset button, it works. Tested with console.log. | |
| 1 file changed, 16 insertions(+) | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| 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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "Clarified comments more, moved the scoreTotalNode variable to a global variable since I can use it in both event listeners. Reset button event listener fully functional. Now to try the animation for when the cookie is clicked." | |
| [master 0eaec08] Clarified comments more, moved the scoreTotalNode variable to a global variable since I can use it in both event listeners. Reset button event listener fully functional. Now to try the animation for when the cookie is clicked. | |
| 1 file changed, 17 insertions(+), 9 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 8, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (8/8), 1.22 KiB | 1.22 MiB/s, done. | |
| Total 8 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 520c513..0eaec08 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: index.html | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "alright, kinda got the animation working. Right now it is a toggle that triggers on click, and I use jquery for it. So I can change it to use pure js, and trigger back to back." | |
| [master 549ec27] alright, kinda got the animation working. Right now it is a toggle that triggers on click, and I use jquery for it. So I can change it to use pure js, and trigger back to back. | |
| 3 files changed, 41 insertions(+) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 7, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (5/5), done. | |
| Writing objects: 100% (7/7), 1.29 KiB | 1.29 MiB/s, done. | |
| Total 7 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 0eaec08..549ec27 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: index.html | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add css/style.css | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "moved transtion property to cookie, so it eases both when the .animate-cookie class is added and removed." | |
| [master 58dead3] moved transtion property to cookie, so it eases both when the .animate-cookie class is added and removed. | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git add index.html | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "removed jQuery, because I don't really need it. Hooooray vanilla js" | |
| [master 68ae0bc] removed jQuery, because I don't really need it. Hooooray vanilla js | |
| 1 file changed, 4 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "alright, so I'm trying to make it so that you can't increment the score while the animation is running. Right now, you can't do that when the animation is easing out, but you can when it's transitioning back in. Maybe that isn't so bad, but whatever I'm commiting now so I can mess around with it more." | |
| [master d6fc766] alright, so I'm trying to make it so that you can't increment the score while the animation is running. Right now, you can't do that when the animation is easing out, but you can when it's transitioning back in. Maybe that isn't so bad, but whatever I'm commiting now so I can mess around with it more. | |
| 1 file changed, 24 insertions(+), 11 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 11, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (9/9), done. | |
| Writing objects: 100% (11/11), 1.64 KiB | 841.00 KiB/s, done. | |
| Total 11 (delta 5), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (5/5), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 549ec27..d6fc766 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "alright, so my console.log messages are doing what I want them to do. I think I can fix the bug (where you can add to the score when the cookie is animating back to the normal size) by moving up the code where I add the .animate-cookie class BEFORE the code that increments the score. That's my hunch at least." | |
| [master 0e2ce47] alright, so my console.log messages are doing what I want them to do. I think I can fix the bug (where you can add to the score when the cookie is animating back to the normal size) by moving up the code where I add the .animate-cookie class BEFORE the code that increments the score. That's my hunch at least. | |
| 1 file changed, 5 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 601 bytes | 601.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| d6fc766..0e2ce47 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "changes the console.log messages around, more accurate now." | |
| [master f741566] changes the console.log messages around, more accurate now. | |
| 1 file changed, 3 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 441 bytes | 441.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 0e2ce47..f741566 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "minor cleanup, added vendor prefixes to transform property, and removed the const $ variable so it doesn't give a warning about the jQuery $ object. At least I think it's an object, it's on `window.$` so maybe it's a property. MAYBE BOTH" | |
| -bash: window.$: command not found | |
| [master 0face8c] minor cleanup, added vendor prefixes to transform property, and removed the const $ variable so it doesn't give a warning about the jQuery $ object. At least I think it's an object, it's on so maybe it's a property. MAYBE BOTH | |
| 2 files changed, 5 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (6/6), 738 bytes | 369.00 KiB/s, done. | |
| Total 6 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| f741566..0face8c master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "alriiiiiiight so I got it working\! I extended the animation time a bit, and there is a delay before you can click the cookie again and increment the score. It isn't the full duration of the animation, it triggers a little after the animation is moving back to the starting position, but it feels pretty good so I'm keeping it. Also, would have been much easier with jQuery. just saying." | |
| [master 5a3c604] alriiiiiiight so I got it working\! I extended the animation time a bit, and there is a delay before you can click the cookie again and increment the score. It isn't the full duration of the animation, it triggers a little after the animation is moving back to the starting position, but it feels pretty good so I'm keeping it. Also, would have been much easier with jQuery. just saying. | |
| 2 files changed, 15 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (6/6), 922 bytes | 461.00 KiB/s, done. | |
| Total 6 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 0face8c..5a3c604 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "removing some of those comments I used when I was troubleshooting the animation triggers. I need to remove some more chaff, but to be safe I'm committing here." | |
| [master 231a18c] removing some of those comments I used when I was troubleshooting the animation triggers. I need to remove some more chaff, but to be safe I'm committing here. | |
| 1 file changed, 1 insertion(+), 7 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 470 bytes | 470.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 5a3c604..231a18c master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "removed some of that extra code, I can definitely refactor but I'll save that for later. I think it's time for lunch" | |
| [master 24c7bac] removed some of that extra code, I can definitely refactor but I'll save that for later. I think it's time for lunch | |
| 1 file changed, 2 insertions(+), 7 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 500 bytes | 125.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 231a18c..24c7bac master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "shorted the animation speed, just cause." | |
| [master 6f2e1b6] shorted the animation speed, just cause. | |
| 2 files changed, 3 insertions(+), 5 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (6/6), 490 bytes | 490.00 KiB/s, done. | |
| Total 6 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 24c7bac..6f2e1b6 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git add js/main.js | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "moved the code in the cookie event listener that adds the animation classes before it increments the score. Makes more sense to me that way." | |
| [master 8e63377] moved the code in the cookie event listener that adds the animation classes before it increments the score. Makes more sense to me that way. | |
| 1 file changed, 17 insertions(+), 25 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git add css/style.css | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "messing around with styles, making a box-shadow when the cookie is clicked." | |
| [master 9c4dc9a] messing around with styles, making a box-shadow when the cookie is clicked. | |
| 1 file changed, 3 insertions(+) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 8, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (8/8), 876 bytes | 292.00 KiB/s, done. | |
| Total 8 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 6f2e1b6..9c4dc9a master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git checkout -b hammad-malik-lab-submission | |
| Switched to a new branch 'hammad-malik-lab-submission' | |
| GAs-MacBook-Air:cookie_clicker ga$ git merge master | |
| Already up to date. | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch hammad-malik-lab-submission | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:cookie_clicker ga$ git branch | |
| hammad-malik-lab-submission | |
| * master | |
| GAs-MacBook-Air:cookie_clicker ga$ git checkout hammad-malik-lab-submission | |
| Switched to branch 'hammad-malik-lab-submission' | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| fatal: The current branch hammad-malik-lab-submission has no upstream branch. | |
| To push the current branch and set the remote as upstream, use | |
| git push --set-upstream origin hammad-malik-lab-submission | |
| GAs-MacBook-Air:cookie_clicker ga$ git push --set-upstream origin hammad-malik-lab-submission | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| * [new branch] hammad-malik-lab-submission -> hammad-malik-lab-submission | |
| Branch 'hammad-malik-lab-submission' set up to track remote branch 'hammad-malik-lab-submission' from 'origin'. | |
| GAs-MacBook-Air:cookie_clicker ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "adding container elements in markup, made main-cookie-container a minimum of 100px high. Now to do the marquee thing. Then try that with multiple cookies. Let's see what happens." | |
| [master 5d0d4f4] adding container elements in markup, made main-cookie-container a minimum of 100px high. Now to do the marquee thing. Then try that with multiple cookies. Let's see what happens. | |
| 2 files changed, 13 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (5/5), 660 bytes | 660.00 KiB/s, done. | |
| Total 5 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 9c4dc9a..5d0d4f4 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "got the marquees to work, the big cookie moves horizontally and vertically. Now to make it move faster, and add some more cookies." | |
| [master a05560e] got the marquees to work, the big cookie moves horizontally and vertically. Now to make it move faster, and add some more cookies. | |
| 2 files changed, 14 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (5/5), 788 bytes | 788.00 KiB/s, done. | |
| Total 5 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 5d0d4f4..a05560e master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: index.html | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "alright, so I have a second cookie now. It has an event listener, so that works just fine. However, the two containers for the cookies stack on top of each other, so you have to scroll down to see the second one. Have to figure out how to fix that." | |
| [master 7f93af0] alright, so I have a second cookie now. It has an event listener, so that works just fine. However, the two containers for the cookies stack on top of each other, so you have to scroll down to see the second one. Have to figure out how to fix that. | |
| 3 files changed, 67 insertions(+), 43 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 7, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (5/5), done. | |
| Writing objects: 100% (7/7), 1.27 KiB | 652.00 KiB/s, done. | |
| Total 7 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| a05560e..7f93af0 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git checkout -- index | |
| error: pathspec 'index' did not match any file(s) known to git. | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git checkout -- index.html | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "alright, so for now I gave up on having the cookies bounce all around the screen. Simply horizontally, I have the two cookies moving. I have to adjust styles on the medium cookie, including giving it the box-shadow, but overall it's not bad." | |
| [master 3150667] alright, so for now I gave up on having the cookies bounce all around the screen. Simply horizontally, I have the two cookies moving. I have to adjust styles on the medium cookie, including giving it the box-shadow, but overall it's not bad. | |
| 2 files changed, 19 insertions(+), 17 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (5/5), 702 bytes | 702.00 KiB/s, done. | |
| Total 5 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 7f93af0..3150667 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/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: css/style.css | |
| modified: index.html | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cookie_clicker ga$ git add . | |
| GAs-MacBook-Air:cookie_clicker ga$ git commit -m "finishing up making the three cookies animate, I'm please. I'll turn this in." | |
| [master 9d16df8] finishing up making the three cookies animate, I'm please. I'll turn this in. | |
| 3 files changed, 43 insertions(+), 18 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Counting objects: 7, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (5/5), done. | |
| Writing objects: 100% (7/7), 989 bytes | 989.00 KiB/s, done. | |
| Total 7 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 3150667..9d16df8 master -> master | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git branch | |
| hammad-malik-lab-submission | |
| * master | |
| GAs-MacBook-Air:cookie_clicker ga$ git checkout hammad-malik-lab-submission | |
| Switched to branch 'hammad-malik-lab-submission' | |
| Your branch is up to date with 'origin/hammad-malik-lab-submission'. | |
| GAs-MacBook-Air:cookie_clicker ga$ git merge master | |
| Updating 9c4dc9a..9d16df8 | |
| Fast-forward | |
| css/style.css | 47 +++++++++++++++++++++++++++++++++++++++++++++-- | |
| index.html | 33 +++++++++++++++++++++++++++++---- | |
| js/main.js | 83 +++++++++++++++++++++++++++++++++++++++++++---------------------------------------- | |
| 3 files changed, 117 insertions(+), 46 deletions(-) | |
| GAs-MacBook-Air:cookie_clicker ga$ git push | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git | |
| 9c4dc9a..9d16df8 hammad-malik-lab-submission -> hammad-malik-lab-submission | |
| GAs-MacBook-Air:cookie_clicker ga$ git status | |
| On branch hammad-malik-lab-submission | |
| Your branch is up to date with 'origin/hammad-malik-lab-submission'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cookie_clicker ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:cookie_clicker ga$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment