Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions exercise/multi_remote/exercise_multi_remote.txt
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,8 @@ git commit -m "Fixed conflicting titles."

git pull
git push

# git can help you to resolve the conflicts using specialized tools
# invoke it with

git mergetool
11 changes: 11 additions & 0 deletions exercise/single_local/exercise_single_local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ git config user.name
git config user.email
git config -l

# Turn on the coloring on console command (visual aids help to find
# out relevant information quicker)

git config --global color.ui true

# Create a proper directory where you want to host a simple project
# named "kindergarten". The current directory (e.g., home) is usually
# fine but you could want a more meaningful place. Then move into the
Expand Down Expand Up @@ -147,6 +152,12 @@ git commit -a -m "Added a swiss clock and improved hello.py."

git log

# See the logs with useful commandline switch (oneline to shorten
# commit message, graph to show a graph of the commits, decorate to
# show HEAD, tags and branch names, all to show all branches)

git log --oneline --graph --decorate --all

# See the logs of all commits with the git GUI.

gitk
Expand Down