From e7339b3b570122cd87907a33722cc09d39026c40 Mon Sep 17 00:00:00 2001 From: ImmortalPC Date: Sun, 1 Sep 2013 15:03:36 +0200 Subject: [PATCH 1/3] Change git cheatsheets: add 'git show' --- cheatsheets/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cheatsheets/git b/cheatsheets/git index 545dfbe..1e3f5c9 100644 --- a/cheatsheets/git +++ b/cheatsheets/git @@ -24,4 +24,4 @@ git fetch upstream # Get branches git branch -va # List local - remote branches git checkout master # Checpkout local master branch git merge upstream/master # Merge remote into local repo - +git show 83fb499 # Show what a commit did. From f8531cfea9982726465da51c9cca1c9de602c2b6 Mon Sep 17 00:00:00 2001 From: ImmortalPC Date: Sun, 1 Sep 2013 15:03:54 +0200 Subject: [PATCH 2/3] Add cheatsheets for distcc --- cheatsheets/distcc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 cheatsheets/distcc diff --git a/cheatsheets/distcc b/cheatsheets/distcc new file mode 100644 index 0000000..2564761 --- /dev/null +++ b/cheatsheets/distcc @@ -0,0 +1,29 @@ +# INSTALL +# ============================================================================== +# Edit /etc/default/distcc and set theses vars +# STARTDISTCC="true" +# ALLOWEDNETS="127.0.0.1 192.168.1.0/24"# Your computer and local computers +# #LISTENER="127.0.0.1"# Comment it +# ZEROCONF="true"# Auto configuration + +# REMEMBER 1: +# Start/Restart your distccd servers before using one of these commands. +# service distccd start + +# REMEMBER 2: +# Do not forget to install on each machine DISTCC. +# No need to install libs ! Only main host need libs ! + +# USAGE +# ============================================================================== + +# Run make with 4 thread (a cross network) in auto configuration. +# Note: for gcc, Replace CXX by CC and g++ by gcc +ZEROCONF='+zeroconf' make -j4 CXX='distcc g++' + +# Run make with 4 thread (a cross network) in static configuration (2 ip) +# Note: for gcc, Replace CXX by CC and g++ by gcc +DISTCC_HOSTS='127.0.0.1 192.168.1.69' make -j4 CXX='distcc g++' + +# Show hosts aviables +ZEROCONF='+zeroconf' distcc --show-hosts From 337817dad34289a2c1a171e780b50302ebe9bc4e Mon Sep 17 00:00:00 2001 From: ImmortalPC Date: Sun, 1 Sep 2013 15:05:38 +0200 Subject: [PATCH 3/3] Translate tabs to spaces --- cheatsheets/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cheatsheets/git b/cheatsheets/git index 1e3f5c9..18906a6 100644 --- a/cheatsheets/git +++ b/cheatsheets/git @@ -24,4 +24,4 @@ git fetch upstream # Get branches git branch -va # List local - remote branches git checkout master # Checpkout local master branch git merge upstream/master # Merge remote into local repo -git show 83fb499 # Show what a commit did. +git show 83fb499 # Show what a commit did.