GitHub / arctraining/swd2_git / commits
| SHA | Message | Author | Date | Stats |
|---|---|---|---|---|
| 5d3d0b61 | merge Merge pull request #4 from ARCTraining/murphyqm-patch-1 |
Maeve Murphy Quinlan <m****n@g****m>
Committed by: GitHub <n****y@g****m> |
over 2 years ago | |
| d2db9f13 | Update 02-setup.md |
Maeve Murphy Quinlan <m****n@g****m>
Committed by: GitHub <n****y@g****m> |
over 2 years ago | |
| 03010496 | merge Merge pull request #2 from ARCTraining/add-branching-lesson |
Martin Callaghan <c****t@g****m>
Committed by: GitHub <n****y@g****m> |
almost 5 years ago | |
| 1e86783b | merge Merge pull request #1 from ARCTraining/master-to-main |
Alex Coleman <a****n@g****m>
Committed by: GitHub <n****y@g****m> |
almost 5 years ago | |
| 2fed0395 | concluded pull request section | Alex Coleman <a****n@g****m> | almost 5 years ago | |
| e35486c1 | adding further annotations to pull request section | Alex Coleman <a****n@g****m> | almost 5 years ago | |
| b11a08a2 | started to add annotations around github pull requests | Alex Coleman <a****n@g****m> | almost 5 years ago | |
| a52754fc | add in screenshot of PR -> merge on GH | Alex Coleman <a****1@l****k> | almost 5 years ago | |
| cb61db5a | added jekyll-cache | Alex Coleman <a****n@g****m> | almost 5 years ago | |
| fdca2950 | added more details to branching section | Alex Coleman <a****n@g****m> | almost 5 years ago | |
| 1c5b3de4 | changing all references to master branch to main | Alex Coleman <a****n@g****m> | almost 5 years ago | |
| d2238934 | initial work adding branching section | Alex Coleman <a****n@g****m> | almost 5 years ago | |
| 0734181a | Small adjustments | Martin Callaghan <c****t@g****m> | over 8 years ago | |
| c1a98d31 | Add edited files | Martin Callaghan <c****t@g****m> | over 8 years ago | |
| a2e0215f | Add all new files | Martin Callaghan <c****t@g****m> | over 8 years ago | |
| 3cda1121 | merge Merge pull request #452 from katrinleinweber/mentoring |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 8 years ago | |
| 02b3dfa0 | fix typo |
Katrin Leinweber <9****r@u****m>
Committed by: GitHub <n****y@g****m> |
over 8 years ago | |
| fdd793db | merge Merge pull request #456 from fmichonneau/add-happy-with-git |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 8 years ago | |
| d65758ee | add link | François Michonneau <f****u@g****m> | over 8 years ago | |
| 4c02fbb2 | add reference to happy with git | François Michonneau <f****u@g****m> | over 8 years ago | |
| 18df4c55 | merge Merge pull request #369 from HeatherNunn/HeatherNunn-patch-1 |
Erin Becker <e****r@g****m>
Committed by: GitHub <n****y@g****m> |
over 8 years ago | |
| b569637c | remove -ed |
Erin Becker <e****r@g****m>
Committed by: GitHub <n****y@g****m> |
over 8 years ago | |
| feae4b4e | merge Merge pull request #454 from bradfordcondon/minor_language_suggestions |
Erin Becker <e****r@g****m>
Committed by: GitHub <n****y@g****m> |
over 8 years ago | |
| e6da8bea | rephrase for elegance | Katrin Leinweber <9****r@u****m> | over 8 years ago | |
| b4aab37c | cite more seriously | Katrin Leinweber <9****r@u****m> | over 8 years ago | |
| d8f07e2e | harmonize wording | Katrin Leinweber <9****r@u****m> | almost 9 years ago | |
| 9985c6ca | additional minor grammar and wordchoice changes | bradfordcondon <b****n@g****m> | almost 9 years ago | |
| 13a97d36 | grammar and word choice to the git log section of lesson 5 | bradfordcondon <b****n@g****m> | almost 9 years ago | |
| d3531242 | merge Merge pull request #443 from GlazerMann/patch-2 |
Daisie Huang <d****h@g****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| e6614d5d | merge Merge pull request #453 from IanLee1521/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 1fa0957c | Added "and" to make sentence flow better |
Ian Lee <I****1@g****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 81dfad6b | merge Merge pull request #450 from caltechlibrary/consistent_checkout |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| af1f767f | merge Merge pull request #451 from mwoodbri/418-fix-history-commands-outputs |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| d69305d1 | relativise link | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| 307f6fd4 | highlight name | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| 529815e6 | harmonise with other enumerations | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| 1d704d62 | simplify phrases | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| 9af96215 | fix typo | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| 865b1b79 | correct product names | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| fc080c49 | refer to examples | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| 80a29b96 | Correct `git diff` and `git show` output in "Exploring History" episode of "V... | Mark Woodbridge <1****i@u****m> | almost 9 years ago | |
| e8a81518 | de-duplicate publication & citation advice | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| 41ae735a | secure links | Katrin Leinweber <k****r@u****e> | almost 9 years ago | |
| 3aa352ce | Make the git checkout command style consistent with rest of lesson | Tom Morrell <t****l@c****u> | almost 9 years ago | |
| f0e71465 | merge Merge pull request #449 from shiltemann/gh-pages |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 94a5e174 | fix typo | shiltemann <z****a@g****m> | almost 9 years ago | |
| cd9bfacc | fix typos | shiltemann <z****a@g****m> | almost 9 years ago | |
| 53fb6ce7 | merge Merge pull request #447 from Gbachant/patch-2 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 970d39c8 | Update 04-changes.md |
Gbachant <G****t@g****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 72f0d7f6 | merge Merge pull request #446 from Gbachant/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| f025adda | Change single quotes to backticks |
Gbachant <G****t@g****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| dc9a0752 | merge Merge pull request #445 from weaverbel/patch-2 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| a565b81b | fix typos and punctuation |
Belinda Weaver <b****r@c****g>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 793debcf | merge Merge pull request #442 from GlazerMann/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 1ebe3c50 | Tell students that git version differences are ok |
GlazerMann <k****n@p****v>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| e2b0af1d | TextWrangler is discontinued, and you need CLI |
GlazerMann <k****n@p****v>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 15765576 | merge Merge pull request #439 from jimmyodonnell/lineendings |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| dd5c2cbe | fix typo | Jimmy O'Donnell <j****o@g****m> | almost 9 years ago | |
| 79fcbc2d | merge Merge pull request #440 from vai2fc/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 1aa03e20 | corrected typo in exiting Vim section |
Veronica Ikeshoji-Orlati <v****c@v****u>
Committed by: GitHub <n****y@g****m> |
almost 9 years ago | |
| 61f97e63 | Explain line ending conflicts and solution (issue #317) | Jimmy O'Donnell <j****o@g****m> | almost 9 years ago | |
| bd24c87c | merge Merge pull request #428 from ajavedm/typo-link-fix |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| 8e2827cc | merge Merge pull request #433 from tylerkelly13/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| 5267c5f3 | Addressing issue #368 adding save file step |
Tyler Kelly <t****y@o****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| e649dc29 | merge Merge pull request #432 from atz/conflict_strategies |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| 0c2ad381 | merge Merge pull request #431 from atz/fixed_width_commit_hash |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| ab5515eb | Add merge conflict avoidance strategies | Joe Atzberger <o****e@g****m> | about 9 years ago | |
| f99ad4f8 | Maintain the convention of fixed-width for commit hashes | Joe Atzberger <o****e@g****m> | about 9 years ago | |
| 63d92393 | Updating .mailmap and AUTHORS before release | Rémi Emonet <r****t@r****e> | about 9 years ago | |
| 5806bcc8 | fix typo and links | Asif Javed <a****d@m****z> | about 9 years ago | |
| 25ff010f | merge Merge pull request #425 from bourque/track-changes-add-objective |
Daisie Huang <d****h@g****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| 302fc0cc | Added a new learning objective regarding commit messages. | Matthew Bourque <b****e@s****u> | about 9 years ago | |
| eff42853 | merge Merge pull request #423 from katrinleinweber/proof-read |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| f2be1eba | merge Merge pull request #421 from aragilar/gh-pages |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| d73fe227 | improve formatting | Katrin Leinweber <k****r@u****e> | about 9 years ago | |
| afd03338 | improve wording | Katrin Leinweber <k****r@u****e> | about 9 years ago | |
| f8eba414 | fix typos | Katrin Leinweber <k****r@u****e> | about 9 years ago | |
| 5d4cf529 | Rename 'change set' to 'changeset' to be consistent with git docs | James Tocknell <a****r@g****m> | about 9 years ago | |
| b99a3815 | Drop 'infective license' definition as it is not used anywhere | James Tocknell <a****r@g****m> | about 9 years ago | |
| e790c6dc | merge Merge pull request #419 from willu47/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| 08f50f21 | Fixed typo in history episode |
Will Usher <w****r@o****k>
Committed by: GitHub <n****y@g****m> |
about 9 years ago | |
| f67da4d7 | merge Merge pull request #417 from jenningsdt/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 81037f5f | Add link to LibreOffice track changes |
David Jennings <j****t@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| ebb31833 | merge Merge pull request #416 from swcarpentry/iglpdc-patch-2 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 53cc70ac | Fix small typo in 05-history |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| ddaf1517 | merge Merge pull request #415 from swcarpentry/iglpdc-patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 601479dd | Fix typo in 07-github |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 545d0772 | merge Merge pull request #330 from rgaiacs/wd-tracking |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| cc9f8923 | merge Merge pull request #396 from mckinniburgh/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 77a37a29 | merge Merge pull request #400 from junghans/patch-1 |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 255969e0 | merge Merge pull request #404 from t4k/collab-review-changes-solution |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 29c8e538 | merge Merge pull request #412 from bbolker/bolker_typos |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 4084532b | Fixes #413 |
Jonah Duckles <j****h@d****g>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| eeeee0d8 | small typos | Ben Bolker <b****r@g****m> | over 9 years ago | |
| 1d08be6c | merge Merge pull request #403 from lonsbio/gh-pages |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| 4240af37 | merge Merge pull request #405 from rgaiacs/gh-pages |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| ec77ae83 | merge Merge pull request #410 from csbailey5t/fix_typo_in_track_changes |
Ivan Gonzalez <i****c@u****m>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| b05c4955 | Fix typo |
Scott Bailey <c****t@v****u>
Committed by: GitHub <n****y@g****m> |
over 9 years ago | |
| af78fc17 | Add files from bin/lesson_initialize.py | Raniere Silva <r****e@r****m> | over 9 years ago | |
| 2baa3b5d | merge Merge remote-tracking branch 'upstream-styles/gh-pages' into git-novice | Raniere Silva <r****e@r****m> | over 9 years ago |