From 0090b67d1d78bef466bdd90f807d626dab053da8 Mon Sep 17 00:00:00 2001 From: Daniele Pizzolli Date: Sat, 19 Apr 2014 11:35:57 +0200 Subject: [PATCH 1/3] Add nice color on console output --- exercise/single_local/exercise_single_local.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/exercise/single_local/exercise_single_local.txt b/exercise/single_local/exercise_single_local.txt index 2fa8ed2..36ce944 100644 --- a/exercise/single_local/exercise_single_local.txt +++ b/exercise/single_local/exercise_single_local.txt @@ -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 From c13d0eddeccdd3dd6166a1c8187a7a60fff72a93 Mon Sep 17 00:00:00 2001 From: Daniele Pizzolli Date: Sat, 19 Apr 2014 11:36:45 +0200 Subject: [PATCH 2/3] Add nice console output for git log --- exercise/single_local/exercise_single_local.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/exercise/single_local/exercise_single_local.txt b/exercise/single_local/exercise_single_local.txt index 36ce944..7d0f6e0 100644 --- a/exercise/single_local/exercise_single_local.txt +++ b/exercise/single_local/exercise_single_local.txt @@ -152,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 From 446c9f865b35ffeb96dbc368c67c9aae18ea87c6 Mon Sep 17 00:00:00 2001 From: Daniele Pizzolli Date: Sat, 19 Apr 2014 11:37:36 +0200 Subject: [PATCH 3/3] Add a note about mergetool --- exercise/multi_remote/exercise_multi_remote.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/exercise/multi_remote/exercise_multi_remote.txt b/exercise/multi_remote/exercise_multi_remote.txt index ba4c7e3..8c10cbc 100644 --- a/exercise/multi_remote/exercise_multi_remote.txt +++ b/exercise/multi_remote/exercise_multi_remote.txt @@ -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