... | @@ -230,7 +230,11 @@ Let's create a file in your git directory and see how this change is shown in gi |
... | @@ -230,7 +230,11 @@ Let's create a file in your git directory and see how this change is shown in gi |
|
6. Once you have made all the changes you want for a certain piece of work, you can commit them all together after adding them.
|
|
6. Once you have made all the changes you want for a certain piece of work, you can commit them all together after adding them.
|
|
> This is as if you are saying "this is a group of changes that belong together and that I am finished with for now".
|
|
> This is as if you are saying "this is a group of changes that belong together and that I am finished with for now".
|
|
|
|
|
|
We commit these changes with the command `git commit`. Once you issue this command, you will be prompted with a text editor of your choice so that you can add a comment to this set of changes. [See here](#setup) and ask a demi to help you change editors if need be.
|
|
We commit these changes with the command `git commit`. Once you issue this command, you will be prompted with a text editor of your choice so that you can add a comment to this set of changes.
|
|
|
|
|
|
|
|
> **INFO**: By default you will be using Vim. This is an advanced text editor. Vim has 2 modes, command mode, and text entry mode. Hit `i` (**i**nsert text) on the keyboard and enter your commit message, then press `esc` to go back into command mode. Now lets **w**rite out the changes and **q**uite by typing `:wq`. [See the links](#links) for some helpful vim guides.
|
|
|
|
|
|
|
|
[See here](#setup) and ask a demi to help you change editors if need be.
|
|
|
|
|
|
In this message you will also see a summary of changes. You should see both "fred.txt" and "java.txt".
|
|
In this message you will also see a summary of changes. You should see both "fred.txt" and "java.txt".
|
|
|
|
|
... | @@ -274,8 +278,10 @@ Now that we have added a commit, we need to send those changes back into GitLab. |
... | @@ -274,8 +278,10 @@ Now that we have added a commit, we need to send those changes back into GitLab. |
|
### Conclusion
|
|
### Conclusion
|
|
You should now be able to manage and contribute to your project! Good luck, and if you spot anything wrong with the wiki, or have suggestions, please log an issue about it [here](https://git.cs.sun.ac.za/Computer-Science/git-beginners/issues).
|
|
You should now be able to manage and contribute to your project! Good luck, and if you spot anything wrong with the wiki, or have suggestions, please log an issue about it [here](https://git.cs.sun.ac.za/Computer-Science/git-beginners/issues).
|
|
|
|
|
|
## Links and Videos
|
|
## Links
|
|
Link | Description
|
|
Link | Description
|
|
--- | ---
|
|
--- | ---
|
|
[git - the simple guide](http://rogerdudler.github.io/git-guide/) | A short but decent guide. Helpful if you want to set up on your own PC.
|
|
[git - the simple guide](http://rogerdudler.github.io/git-guide/) | A short but decent guide. Helpful if you want to set up on your own PC.
|
|
[RW244 Documentation](http://cs.sun.ac.za/rw244/program/#documentation) | Willem Bester's website, includes many helpful links.
|
|
[RW244 Documentation](http://cs.sun.ac.za/rw244/program/#documentation) | Willem Bester's website, includes many helpful links.
|
|
|
|
[Vim Quick Guide](https://eastmanreference.com/a-quick-start-guide-for-beginners-to-the-vim-text-editor) | A quick start guide for beginners to the Vim text editor.
|
|
|
|
[Vim Cheat Sheet](https://vim.rtorr.com/) | A more exhaustive Vim cheat sheet. |
|
|
|
\ No newline at end of file |