From bc7512fe9abfc85dcccf23900f1003f6fe715619 Mon Sep 17 00:00:00 2001 From: ndreys Date: Tue, 1 Nov 2011 18:17:52 +0700 Subject: [PATCH 1/6] 0_Interactive_Rebasing.markdown: Fix missed -m option --- text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown index defcc336..628a6d24 100644 --- a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown +++ b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown @@ -111,9 +111,9 @@ the rebase dropped you to the command line : $ git reset HEAD^ $ git add file1 - $ git commit 'first part of split commit' + $ git commit -m 'first part of split commit' $ git add file2 - $ git commit 'second part of split commit' + $ git commit -m 'second part of split commit' $ git rebase --continue And now instead of 5 commits, you would have 6. From 724e99422ae68ec5eb5943d46e2289dd6f8acbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Leinh=C3=A4user?= Date: Thu, 17 Nov 2011 12:13:02 +0100 Subject: [PATCH 2/6] Intended code block was not indented with enough spaces. --- text/31_Git_Hooks/0_ Git_Hooks.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text/31_Git_Hooks/0_ Git_Hooks.markdown b/text/31_Git_Hooks/0_ Git_Hooks.markdown index e4104506..4bcfb893 100755 --- a/text/31_Git_Hooks/0_ Git_Hooks.markdown +++ b/text/31_Git_Hooks/0_ Git_Hooks.markdown @@ -199,7 +199,7 @@ This hook executes once for the receive operation. It takes no arguments, but for each ref to be updated it receives on standard input a line of the format: - SP SP LF + SP SP LF where `` is the old object name stored in the ref, `` is the new object name to be stored in the ref and From 5b718099b082863291a578551248b7824deeed58 Mon Sep 17 00:00:00 2001 From: Mark Campbell Date: Mon, 19 Dec 2011 07:38:37 -0600 Subject: [PATCH 3/6] Added keyboard left-right bindings for book navigation. --- assets/javascripts/navigation.js | 22 ++++++++++++++++++++++ layout/chapter_template.html | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 assets/javascripts/navigation.js diff --git a/assets/javascripts/navigation.js b/assets/javascripts/navigation.js new file mode 100644 index 00000000..456df262 --- /dev/null +++ b/assets/javascripts/navigation.js @@ -0,0 +1,22 @@ +$(document).keydown(function(ev) { + if (ev.keyCode == 37) { + if ($("div.nav a").size() === 2) { + window.location = $(".nav:first-child a").attr('href'); + return false; + } + else if ($("div.nav a").size() === 1 && $("div.nav a:first").text().toLowerCase().indexOf("prev") !== -1 ) { + window.location = $("div.nav a:first").attr('href'); + return false; + } + } + else if (ev.keyCode == 39) { + if ($("div.nav a").size() === 2) { + window.location = $("div.nav a:last").attr('href'); + return false; + } + else if ($("div.nav a").size() === 1 && $("div.nav a:first").text().toLowerCase().indexOf("next") !== -1) { + window.location = $("div.nav a:first").attr('href'); + return false; + } + } +}); diff --git a/layout/chapter_template.html b/layout/chapter_template.html index ee59c1d9..98b1e58d 100644 --- a/layout/chapter_template.html +++ b/layout/chapter_template.html @@ -11,6 +11,8 @@ + + From 8385a057f96dac41fabb6076cece3095cece5434 Mon Sep 17 00:00:00 2001 From: Simar Mugattarov Date: Fri, 17 Feb 2012 11:37:48 +0400 Subject: [PATCH 4/6] Fixed word 'pusing' to pushing in 14 section --- text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown index defcc336..07cd43d1 100644 --- a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown +++ b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown @@ -1,7 +1,7 @@ ## Interactive Rebasing ## You can also rebase interactively. This is often used to re-write your -own commit objects before pusing them somewhere. It is an easy way to +own commit objects before pushing them somewhere. It is an easy way to split, merge or re-order commits before sharing them with others. You can also use it to clean up commits you've pulled from someone when applying them locally. From d693b2eecd65919fc727e6b63866529c561962af Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 26 Feb 2012 23:56:42 +0100 Subject: [PATCH 5/6] Fix typo "dont" -> "don't" --- .../0_ Reviewing_History_Git_Log.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text/09_Reviewing_History_Git_Log/0_ Reviewing_History_Git_Log.markdown b/text/09_Reviewing_History_Git_Log/0_ Reviewing_History_Git_Log.markdown index 7cb7c12d..369acbe9 100644 --- a/text/09_Reviewing_History_Git_Log/0_ Reviewing_History_Git_Log.markdown +++ b/text/09_Reviewing_History_Git_Log/0_ Reviewing_History_Git_Log.markdown @@ -14,7 +14,7 @@ can also make more specific requests: $ git log fs/ # commits that modify any file under fs/ $ git log -S'foo()' # commits that add or remove any file data # matching the string 'foo()' - $ git log --no-merges # dont show merge commits + $ git log --no-merges # don't show merge commits And of course you can combine all of these; the following finds commits since v2.5 which touch the Makefile or any file under fs: From 5f790a56aff18576251d31e4ac7713912f8120d9 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 26 Feb 2012 23:57:23 +0100 Subject: [PATCH 6/6] Fix capitalized word after colon --- text/07_Normal_Workflow/0_ Normal_Workflow.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/text/07_Normal_Workflow/0_ Normal_Workflow.markdown b/text/07_Normal_Workflow/0_ Normal_Workflow.markdown index abddef62..8e95b612 100644 --- a/text/07_Normal_Workflow/0_ Normal_Workflow.markdown +++ b/text/07_Normal_Workflow/0_ Normal_Workflow.markdown @@ -38,7 +38,7 @@ Alternatively, instead of running `git add` beforehand, you can use which will automatically notice any modified (but not new) files, add them to the index, and commit, all in one step. -A note on commit messages: Though not required, it's a good idea to +A note on commit messages: though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. Tools that turn commits into email, for @@ -55,4 +55,4 @@ and newly modified files, and in both cases it takes a snapshot of the given files and stages that content in the index, ready for inclusion in the next commit. -[gitcast:c2_normal_workflow]("GitCast #2: Normal Workflow") \ No newline at end of file +[gitcast:c2_normal_workflow]("GitCast #2: Normal Workflow")