Jonathan Nieder wrote: > [...] >> --- a/t/t1200-tutorial.sh >> +++ b/t/t1200-tutorial.sh >> @@ -156,7 +156,7 @@ Updating VARIABLE..VARIABLE >> FASTFORWARD (no commit created; -m option ignored) >> example | 1 + >> hello | 1 + >> - 2 files changed, 2 insertions(+), 0 deletions(-) >> + 2 files changed, 2 insertions(+) >> EOF > > Yes, this one's necessary. > > (*) It's reminding us to update the gitcore-tutorial. :) Patch for squashing (untested) below. Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> --- Documentation/gitcore-tutorial.txt | 2 +- Documentation/gittutorial-2.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index c27d086f..fb0d5692 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -1004,7 +1004,7 @@ Updating from ae3a2da... to a80b4aa.... Fast-forward (no commit created; -m option ignored) example | 1 + hello | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) + 2 files changed, 2 insertions(+) ---------------- Because your branch did not contain anything more than what had diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt index f1e4422a..e00a4d21 100644 --- a/Documentation/gittutorial-2.txt +++ b/Documentation/gittutorial-2.txt @@ -34,12 +34,12 @@ $ echo 'hello world' > file.txt $ git add . $ git commit -a -m "initial commit" [master (root-commit) 54196cc] initial commit - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) create mode 100644 file.txt $ echo 'hello world!' >file.txt $ git commit -a -m "add emphasis" [master c4d59f3] add emphasis - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) ------------------------------------------------ What are the 7 digits of hex that git responded to the commit with? -- 1.7.9 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html