... | @@ -1811,6 +1811,7 @@ The remaining lines (i.e., the commit message) describe a group of changes. |
... | @@ -1811,6 +1811,7 @@ The remaining lines (i.e., the commit message) describe a group of changes. |
|
As a general rule all lines should not exceed 80 characters. This avoids
|
|
As a general rule all lines should not exceed 80 characters. This avoids
|
|
horizontal scrolling.
|
|
horizontal scrolling.
|
|
|
|
|
|
|
|
|
|
### Suggested Reading
|
|
### Suggested Reading
|
|
|
|
|
|
If you search Google with the query *"Writing good git commit messages"* you
|
|
If you search Google with the query *"Writing good git commit messages"* you
|
... | @@ -2163,15 +2164,35 @@ The three *style cleanup* branches were eventually merged into `f19-prep`. The |
... | @@ -2163,15 +2164,35 @@ The three *style cleanup* branches were eventually merged into `f19-prep`. The |
|
> The [`git merge` command](https://git-scm.com/docs/merge-strategies) warrants
|
|
> The [`git merge` command](https://git-scm.com/docs/merge-strategies) warrants
|
|
> its own discussion. The command will be discussed, if time permits.
|
|
> its own discussion. The command will be discussed, if time permits.
|
|
|
|
|
|
---
|
|
|
|
|
|
|
|
## Workflow Example 2 - This Presentation
|
|
## Workflow Example 2 - This Presentation
|
|
|
|
|
|
This Presentation was written in Vim... as markdown... using the [CS department
|
|
This Presentation was written in Vim...
|
|
GitLab server](https://git-community.cs.odu.edu)... as a Wiki... which uses
|
|
|
|
Git.
|
|
- using markdown...
|
|
|
|
- using the [CS department GitLab server](https://git-community.cs.odu.edu)...
|
|
|
|
- in a Gitlab Wiki...
|
|
|
|
- which uses git to track history.
|
|
|
|
|
|
|
|
|
|
|
|
### Where Did I Stop?
|
|
|
|
|
|
|
|
Most people do not work 24/7. People sleep, take breaks, and eat food. Sometimes
|
|
|
|
we forget where we left off. A number of potential questions come to mind:
|
|
|
|
|
|
|
|
- What was the last edit?
|
|
|
|
- When was the last edit?
|
|
|
|
- Who made the last edit?
|
|
|
|
- When was the last edit made to line 125?
|
|
|
|
|
|
|
|
Suppose I wanted more detail between two *commits*. A quick
|
|
|
|
|
|
|
|
`git diff HEAD^`
|
|
|
|
|
|
|
|
can retrieve a summary of the changes between the current commit and its
|
|
|
|
immediate ancestor.
|
|
|
|
|
|
|
|
|
|
Suppose I wanted more detail between two *commits*. A quick `git diff HEAD^` could yield
|
|
|
|
|
|
|
|
![git diff example](https://git-community.cs.odu.edu/tkennedy/retreat/-/wikis/git-diff-example.PNG)
|
|
![git diff example](https://git-community.cs.odu.edu/tkennedy/retreat/-/wikis/git-diff-example.PNG)
|
|
|
|
|
... | | ... | |