threads / discuss / 37938

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

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

## tl;dr

3 messages between Nov 12, 2014 and Nov 12, 2014. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Thomas Ackermann· Nov 12, 2014, 08:57 UTC · lore

 
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 <gitster@pobox.com>
An:      Thomas Ackermann <th.acker@arcor.de>
Datum:   11.11.2014 23:51
Betreff: Re: [PATCH] gittutorial.txt: remove reference to ancient Git version

Show 7 quoted lines

> 
> 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

Stefan Näwe· Nov 12, 2014, 09:12 UTC · re: Thomas Ackermann · lore

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

-----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:

Show changes to Documentation/gittutorial.txt +9 −11

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-----

Stefan Näwe· Nov 12, 2014, 09:20 UTC · re: Stefan Näwe · lore

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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 12.11.2014 um 10:12 schrieb Stefan Näwe:

Show 10 quoted lines

> 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:

Show changes to Documentation/gittutorial-2.txt +12 −14

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-----