Aw: Re: [PATCH] gittutorial.txt: remove reference to ancient Git version

2014-11-12 Thread Thomas Ackermann
 
I also re-read the whole document and think it's still up-to-date
with Git 2.0. But I might have missed some subtler points.

Thomas

- Original Nachricht 
Von: Junio C Hamano gits...@pobox.com
An:  Thomas Ackermann th.ac...@arcor.de
Datum:   11.11.2014 23:51
Betreff: Re: [PATCH] gittutorial.txt: remove reference to ancient Git version

 
 Yeah, sounds like going in the right direction.
 
 Perhaps we should start doing a serious re-reading of this document
 and update the contents to suggest better ways that were invented
 to solve common problems since this document was written.
 


---
Thomas
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



Re: [PATCH] gittutorial.txt: remove reference to ancient Git version

2014-11-12 Thread Stefan Näwe
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Am 12.11.2014 um 09:57 schrieb Thomas Ackermann:
  
 I also re-read the whole document and think it's still up-to-date
 with Git 2.0. But I might have missed some subtler points.

Hhmm..
At least this is not 100% up to date:

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 8262196..8715244 100644
- --- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -107,14 +107,15 @@ summary of the situation with 'git status':

 
 $ git status
- -# On branch master
- -# Changes to be committed:
- -#   (use git reset HEAD file... to unstage)
- -#
- -#  modified:   file1
- -#  modified:   file2
- -#  modified:   file3
- -#
+On branch master
+Changes to be committed:
+Your branch is up-to-date with 'origin/master'.
+  (use git reset HEAD file... to unstage)
+
+modified:   file1
+modified:   file2
+modified:   file3
+


Stefan
- -- 
- 
/dev/random says: The drunker I sit here, The longer I get.
python -c print 
'73746566616e2e6e616577654061746c61732d656c656b74726f6e696b2e636f6d'.decode('hex')
 
GPG Key fingerprint = 2DF5 E01B 09C3 7501 BCA9  9666 829B 49C5 9221 27AF
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iEYEARECAAYFAlRjJGgACgkQgptJxZIhJ6+MfQCeI4iZ3HSkT0Lsk1sh1ckHLBzK
ROwAnAog8We8VLs6trwJsSQqZWDg7ndN
=YC26
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] gittutorial.txt: remove reference to ancient Git version

2014-11-12 Thread Stefan Näwe
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Am 12.11.2014 um 10:12 schrieb Stefan Näwe:
 Am 12.11.2014 um 09:57 schrieb Thomas Ackermann:
 
 I also re-read the whole document and think it's still up-to-date
 with Git 2.0. But I might have missed some subtler points.
 
 Hhmm..
 At least this is not 100% up to date:
 
 diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
 [...]

And while at it:

diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt
index 3109ea8..1901af7 100644
- --- a/Documentation/gittutorial-2.txt
+++ b/Documentation/gittutorial-2.txt
@@ -368,17 +368,18 @@ situation:

 
 $ git status
- -# On branch master
- -# Changes to be committed:
- -#   (use git reset HEAD file... to unstage)
- -#
- -#   new file: closing.txt
- -#
- -# Changes not staged for commit:
- -#   (use git add file... to update what will be committed)
- -#
- -#   modified: file.txt
- -#
+On branch master
+Changes to be committed:
+  (use git reset HEAD file... to unstage)
+
+new file:   closing.txt
+
+Changes not staged for commit:
+  (use git add file... to update what will be committed)
+  (use git checkout -- file... to discard changes in working directory)
+
+modified:   file.txt
+


Stefan
- -- 
- 
/dev/random says: Make it idiot proof and someone will make a better idiot.
python -c print 
'73746566616e2e6e616577654061746c61732d656c656b74726f6e696b2e636f6d'.decode('hex')
 
GPG Key fingerprint = 2DF5 E01B 09C3 7501 BCA9  9666 829B 49C5 9221 27AF
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iEYEARECAAYFAlRjJmoACgkQgptJxZIhJ6+LBgCgmVgJCmJjC86NHopW1rQwk/eA
r04AoIgMfKhB00H8KCHBMAsC5LjCFXY5
=bNM+
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] gittutorial.txt: remove reference to ancient Git version

2014-11-11 Thread Thomas Ackermann

Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
 Documentation/gittutorial.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index af9f709..710e636 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -3,7 +3,7 @@ gittutorial(7)
 
 NAME
 
-gittutorial - A tutorial introduction to Git (for version 1.5.1 or newer)
+gittutorial - A tutorial introduction to Git
 
 SYNOPSIS
 
-- 
1.9.4.msysgit.0
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] gittutorial.txt: remove reference to ancient Git version

2014-11-11 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes:

 Signed-off-by: Thomas Ackermann th.ac...@arcor.de
 ---
  Documentation/gittutorial.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
 index af9f709..710e636 100644
 --- a/Documentation/gittutorial.txt
 +++ b/Documentation/gittutorial.txt
 @@ -3,7 +3,7 @@ gittutorial(7)
  
  NAME
  
 -gittutorial - A tutorial introduction to Git (for version 1.5.1 or newer)
 +gittutorial - A tutorial introduction to Git
  
  SYNOPSIS
  

Yeah, sounds like going in the right direction.

Perhaps we should start doing a serious re-reading of this document
and update the contents to suggest better ways that were invented
to solve common problems since this document was written.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html