Skip to content

GitLab

Git Workshop · Changes

Page history
Start branch example authored by Thomas Kennedy's avatar Thomas Kennedy
Show whitespace changes
Inline Side-by-side
Git-Workshop.md
View page @ 8928eb57
......@@ -1821,8 +1821,306 @@ short and concise.
## Branches
T.B.W
If we run a slightly modified version of our previous git log command...
```bash
git -C ~/Courses/Reviews/cs330/s20 log --since 'January 1 2019' --graph --decorate --all --pretty=oneline --abbrev-commit
```
...we more condensed view. Now the different git branches are more visible.
<details>
<summary>*Updates since 11 January 2019 - Short Version*</summary>
```
* eefa03b (HEAD, origin/s20, origin/master, origin/HEAD, s20, master) Add profiling compilation flags to Review 03 Example 6
* 2dbf7c6 Update Python pydoc style
* 0c13d43 Update docstrings to follow Google Style
* 7f6392c Correct '{' style issues
* 84e791c Add style corrections from Review 03 lectures
* 0da91a6 Update md file with current s20 updates
* 98399d3 Add gcovr demo to final Review 03 C++ Example
* 0bff9c5 Fix REview 02 whitespace/style
* c939634 Add Tox to Review 03 Python example
* 641abc3 Tweak Review 03 Python example
* 8314e15 Correct typos
* 2788930 Make final? round of tweaks to Review 03 Python example
* 3cea3f3 Make second pass through Python Review-03 example
* 4ee14c7 Create first working draft of Python Review-03 example
* 7547ea9 Tweak Rust House example
* 43bab1e Update Example 7 and promote it to Example 6
* 4ecbd2f Update Example 6 and promote it to Example 5
* 7291f3a Update Example 5 and promote it to Example 4
* 9b56a10 Update Example 4 to serve as (and replace) Example 3
* 15374dc Update Review-03/Example{1,2}
* 23be84d Merge Review 03 Example-2 and Example 3 discussions
* 5428862 Renumber Review 03 Examples
* dc20c56 Remove copy-and-pasted examples
* 2b6ccd1 Clean up Review 01 Example style
* 3c989b1 (origin/f19) Record tox and Python Shape (live) discussion updates
* 0cba1b9 Record style tweaks from lecture
* 39ae53e Add javadoc typo corrections from live discussion
* e69105b Write a quick intstream example
* fae0ecb Correct a couple minor documentation typos
* b296cdd Update jacoco tool version from 0.8.0 to 0.8.5
* a398f20 Remove makefiles from Java Shapes Examples
* 93edd26 Tweak Java Shapes Example (RunShapes)
* ac9ef21 Tweak Python Shapes Example
* f6c154f Tweak Python Shapes Examples
* 20f2607 Update last Java Shapes example
* f7cbd3b Tweak ShapeIterator logic
* cbcb9db Add documentation to ShapeIterator
* 2a4dc01 Finlalize? ShapeIterator for final Java Shapes example
* f19ec32 Start custom Java Iterator implementation example
* 09700e9 Merge branch 'f19' of git-community.cs.odu.edu:tkennedy/cs330-examples into f19
|\
| * 7621d29 Tweak Python Linked List example
* | dfe3461 Replace ActionListener with lambda in Prime Gui Example
|/
* 5a6e079 Make another round of tweaks to Python Linked List
* 564d1f2 Rename Python Linkked List files to follow convention
* cc8f237 Start tweaks to Python Linked List Example
* a59416b Tweak Python Linked List Example
* 3fb174b Tweak Python Toy Examples
* cd3b55c Tweak Python Shapes Example
* 832be20 Move deploy-all.py to its own Git repo
* aa53220 Tweak Final JAva Shapes Example
* 7e30032 Fix deploy --all-dirs zipfile logic
* 71c446f Copy Java Shapes Unit Tests into Examples 2 to 6
* 73813f8 Finalize Java Shape Unit Tests
* 773c87c Moved TestShapeFactory to Example 2
* d5524df Tweak Java Shapes Example drivers
* 05f158c Start porting Python Shape unit tests to Java
* d63532e Start updates to Java Shapes Examples
* 3d586a7 Finalize Review 06 Example 9
* c691bd3 Tweak deploy script output
* 2b1b2f6 Add templated transform_if example
* 598b064 Apply updates from lecture
* 716dbaf Update Review readme
* 7516749 Add commented alternative to auto in lambda
* 2417cfc Update Python Shapes Example to use @abstractmethod
* 3f1fa05 Tweak whitespace in C++ Fibonacci example
* dc96b01 Tweak Shapes C++ Example 9
* 277b96a Finalize C++ Shapes new Example 9
* 2b335ec Fix silly typos
* fb13109 Add explict '= default' for Big-3
* 1b2c0a7 Refactor print utility functions
* 2d8602c Tweak Review 05
* ea4d984 Add some constructor delegation
* 224ddca Add more lambda demos
* 082da8f Refactor output utilities using template trickery
* 3866422 More string view/utility updates
* 181c028 Merge branch 'f19' of git-community.cs.odu.edu:tkennedy/cs330-examples into f19
|\
| * 59efca7 Update C++ shapes discussion makefiles
* | 2292b1a More string view/utility updates
|/
* 8325ed0 Update utilities library to use string_view
* 82ff001 Start Example 9 (demo C++20 features - string_view)
* e1fc4a5 Fix C++ Doxygen to Rustdoc comment oversight
* 197e7bb Tweak Final C++ Room Renovation Example
* de989b5 Merge branch 'f19' of git-community.cs.odu.edu:tkennedy/cs330-examples into f19
|\
| * 8652410 Add std::bind to Example 9
* | 2198332 Correct spacing in House.h
|/
* 226e9f7 Update Plant UML Seq Diagram with underlines and aliases
* c0ba4cd Merge branch 'f19' of git-community.cs.odu.edu:tkennedy/cs330-examples into f19
|\
| * a114b8b Add missing typehints to Review 04 Example 7
* | ebc296e Add Plant UML Seq Diagram example
|/
* 04b4462 Refactor TicTacToe Python Example 7
* d83fb14 Review 04 Doc Comment Cleanup based on Google/Sphinx format
* 860214a Review 04 Style cleanup based on pylint and pycodestyle
* bb283ba First pass at Review 04 Example 7 -> Pylint cleanup example
* d056368 Remove 'src' sub dir from Python TicTactoe example
* 8541260 allow Err to be ignored for writeln! macros
* f43f775 Finalize Rust Room Renovation Example (documentation Default Trait)
* 04fb0df Add Rust support to deploy script
* e183c91 Tweak Rust Room Renovation Example output
* 68324e6 Add Iterator to, and fix House encapsulation in Rust Room Renovation Example
* f03ed0c Update Initial Rust Example to demo Rust '.iter()' methods
* 5ebb58f Add initial Rust Room Renovation Example for Head-to-Head testing discussion
* 7ea64a3 Draft Review 03 UML Class Diagram
* a7d1d7b Add Review 01 UML Class Diagram, and makefile updates from lecture
* 04ebe0f Update Review 03 makefiles
* d2b1848 Update Review 02 makefiles
* da1f585 Add LinkedList Iterator with std::iterator_traits
* d85004e Tweak doxygen config for new Linkedlist Example
* 2122c10 Remove erroneus memory pool example (Example 9) from Review 03
* fe536f3 Add memory pool example (Example 6) to Review 01
* cf5e660 Add memory pool example to Review 03
* 5e4a350 Finish updating Java Shapes Gradle build to 5.6.1
* a7491c5 Start updating Java Shapes Gradle build
* 8a7e03c Play with Java Mountain code
* 27336d1 Update Review 10 Gradle build
* 4e20dae Update Java Morris Mountain Example (~60% complete)
* d359119 Remove remaining top-level makefiles
* 56fe6bf Remove top-level makefiles from Review 05 Examples
* 876c011 Update Review 04 Gradle build
* dd09601 Remove top-level makefiles from Review 02-04 Examples
* 16e0f30 Remove top-level makefiles from Review 01 Examples
* 651b2fd Tweak Review 01/Example 5 for Tuesday lecture
* 2ba41be Add corrections from lecture
* 33da72c Add source/makefile check to deplioy script
* b0ebea8 Add option to skip deploy (cleanup and doc) operations
* 2395ebe Remove old bodge shell script deploy system
* 0d19735 Refactor and add --no-zip option (deploy script)
* dd72487 Add all_dir glob option to deploy script
* b04ae8f Add toggle for review dir or example dir scheduling
* f1ce55f Mark scripts as executable
* b872584 Use Example dirs instead of Review dirs for parallel deploy
* a639a6e Add compression to zipfile generation
* 8ea2924 Draft second iteration of python deploy replacement script
* 152d0e6 Draft first iteration of python deploy replacement script
* c802d10 Migrate coin flip example to Gradle 5.5.1
* d331eeb Update Java Toy Example 3 to Gradle 5.5 w/config updates
* adadbef (origin/f19-prep) Merge branch 'style-cleanup-java' into f19-prep
|\
| * 44f48f5 (origin/style-cleanup-java) Review 04 Example 5 cleanup
* | 047edec Merge branch 'style-cleanup-java' into f19-prep
|\ \
| |/
| * 4a757c5 Clean up Java ShapeFactory
* | 52fb874 Merge branch 'style-cleanup-python' into f19-prep
|\ \
| |/
|/|
| * a2b4638 (origin/style-cleanup-python) Cleanup Python Tos (Review Set 13)
* | a21ec9c Add Updated PrimeGenerator from CS 350 (as Example 2)
* | 9f9a87e Cleanup GuiThread Example
|/
* 0c54771 Merge branch 'style-cleanup-java' into f19-prep
|\
| * 89869cc Clean up Java Shapes Example Utilities class
| * f78b8cb Cleanup Review 07 Example 3
| * 9250f41 Add Java Stylecheck script
* | 9a6ed92 Add tox to Python examples with unit tests
|/
* 502ada5 Merge branch 'style-cleanup-c++' into f19-prep
|\
| * a40aa36 (origin/style-cleanup-c++) Clean up Review 06
* | cf42a9e Merge branch 'style-cleanup-c++' into f19-prep
|\ \
| |/
| * 3887a48 Clean up Review 01 & 06 Examples
| * 9a07837 Clean up Review 06 Examples - runShapes.cpp
| * fe8e2ab Clean up Review 03 Examples
| * a183c65 Clean up Review 02 Examples
| * 90db662 Clean up Review 01 Examples
| * 7afd97a Clean up Review 06 C++ Shapes Examples
| * 9f7cbfc Clean up Review 01 Examples
| * 0670840 Rewrite style check script to seperate each Review set into its own report
| * 562bb39 Clean up Review 04 and Review 05
| * 29562bb Add CPPLINT settings/ignore rules
| * aa3e52f Cleanup line lenght, missing includes, and all utilities.{h,cpp} files
| * ed6d68e Clean up utiltities.{h,cpp} code style
* | 0fd11e4 Update Shape factory tests
* | b477c46 Fix style based on pycodestyle report
|/
* 5e73324 Cleanup python examples
* 480cf66 Cleanup Shapes Example 7
* 2d6afdf Cleanup Shapes Example 7
* c12bd9d Add Linked List Example 5
* f827f42 Finalize Python Shapes Example 7
* fc6c75c Comment out debug output line
* f6b04d9 Clean up Review 01 & Review 03 code style
* 94254e5 Upgrade gradle wrapper to 4.9
* 3c67bdf Add Move copy/assignment to Linked List discussion
* 6f6a1cc Add Rust fibonacci example
* d8bf676 Begin Cleanup based on Pylint & migration to Google Docstring style
* 3149b9e (origin/s19) Add Python min/max example
* 719bfee Fix var names in Python Shapes Examples
* 882bdb4 Update Review Listing/Overview
* 5c547b5 Update Python Shapes runShapes.py drivers.
* b7236df Update .gitignore file
* 405b795 Set up unit tests in Shapes Examples 2+
* e026694 Update shapes classes based on errors detected in unit tests. Update for Python naming conventions
* 0e467db Add shapes module unit tests
* 8afb875 First round of updates to Python Shapes Example 1
* 08cee4b First round of updates to Pyhton Shapes Examples
* 39659f1 Add missing @Override decorators in Gui/Thread discussion
* 97badde Add new property/setter/name-mangling Linked List Example
* f414224 Changes/tweaks from recorded discussion update
* 2a014eb Changes/tweaks from recorded discussion update
* fb2e053 Removed trailing whitespace
* 57e7177 Fixed heading typos
* 7cbe702 Added iterator method to prime number thread example
* eb3f08b Update Review Summary
* 75e59cf Changes from Shapes recording update
* 0a1af9a Code formatting fixes from recorded discussion
* 6a944ce Copy updated review page from course site
* 9aec851 Code format tweaks from lecture
* 3bca2c6 Add missing deploy script to Python Linked List Example
* 58e6499 Tweaks to whitespace
* 6ecb7bd Tweaks to gradle build
* e057c08 Minor style edits to Gui Discussion
* ccc2071 Final Update to Java Shapes Examples
* f1a6997 Complete Gradle Updates to Java Shapes Examples
* cf1724e Change Java Shapes Examples 1 and 2 to Gradle from make
* 3877a7a Renumber Java Shapes Examples based on removed examples
* 47e1f04 Add deploy script to new UML SD example
* 9adcd99 Prepped UML Sequece Diagrams for Tuesday Lecture
* aea6708 Re-number all post-Java-Toys review example sets to make room for UML Sequence Diagram Discussion
* af0a5ab Updates from live lecture demos
* e91d03b Merge branch 's19' of git-community.cs.odu.edu:tkennedy/cs330-examples into s19
|\
| * 1087829 Update Python TicTacToe Example with coverage.py support:
| * c64a5fb Add Python coverage ignore rules
| * ceeb45e Continued updates to Java Gui Examples (re-number)
| * a94b592 Continued updates to Java Shape Examples (re-number)
* | 498f916 Update line breaks based on live discussion
|/
* 1b7374f Update String Formatting code in Examples 4 through 7
* 3fff4a3 Update Java Shapes Examples 1 & 2
* 5b8d956 C++ Shapes edits from recorded lectures
* 2ec6885 Update makefiles
* 3bff9a5 Re-number pointer review examples
* 94cd9ac Start Example 3 for Python Linked List (prep for full checklist/unit tests)
* 91eac96 Seperated Python Linked Lists & Toys Examples into two sets
* e599b03 Cleanup Java GUI Examples (1-3 demoed analysis tools & Gradle which are now introduced in the Java Shapes Discussion)
* 88854a5 Begin cleanup of Example 7
* 09581ae Remove Example 6. Example 7 is the cleaned up version (package names, javadoc, List vs ArrayList)
* 49d2550 Begin Updates to Review 6
* 91dd7e4 Remove Example 3: 1. Example 4 was the same, but with Gradle instead of make. 2. Add "System.out.println(it.next())" to Example 4
* 65193a7 Update Java Shapes discussion Example 5 (add read method)
* 75ff1c8 Update First 4 Java Shape Discussions (Examples 1 to 4)
* c3add86 Minor tweaks to Java Thread discussion
* b63903b Begin updates to Java GUI discussion
* 0128f58 Finalize Java Toys discussion
* d40be0d Finalize C++ Shapes Example 8
* e7ce50c First round of updates to C++ Shapes Example 8
* 61f0fa5 Continue C++ Shape Example Updates 3. Finish Examples 5 to 7 4. Start updating Example 8
* 37fec77 Start C++ Shape updates: 1. Cleanup whitespace and comments in Examples 1 to 4 2. Update utilities.{h,cpp} in all 8 examples 3. Finalize Examples 1 to 4
* 3b8fc17 Finalize Pointer Review
* fafd0aa Begin Ponter Example updates:
* 5dfd5a5 Begin updating Pointer examples
* d3fe0c9 Cleanup trailing whitespace (changes from lecture discussion)
* 186e895 Updated from Review 04 Unit Testing discussion
* aceab3d Cleanup Review 04 unit test examples
* 774cfe5 Fix initialization order
* 7aa4ffc Updates from Review 04 dicussion
* 7b9ec72 Updated Pointer Review Example 4
* 86b225d Removed loop notes - these are now a proper lecture
* 3fc0714 Update TicTacToe UML Class diagram
* 59f6373 Update C++ Tic-Tac-Toe examples
* 571b089 Add missing return to assignment operator
* b837283 Update Review 03 with Constructor delegation
* 50bd0c6 Change conditional block to one line boolean expression
* e6ef4af Lecture type corrections
* 5b47c75 Update Reviews listing
* 0cf292a Review 01 changes from live lecture
* cf4d9f2 Undo lecture comments
* b71ce4a Update .gitignore
```
</details>
Let us focus on a specific section of the log.
![Git Log Branch Example](./cs330-branch-snip/PNG)
---
......