* [PATCH] gittutorial.txt: remove reference to ancient Git version
@ 2014-11-11 19:13 Thomas Ackermann
2014-11-11 22:51 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Ackermann @ 2014-11-11 19:13 UTC (permalink / raw)
To: git; +Cc: gitster
Signed-off-by: Thomas Ackermann <th.acker@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gittutorial.txt: remove reference to ancient Git version
2014-11-11 19:13 [PATCH] gittutorial.txt: remove reference to ancient Git version Thomas Ackermann
@ 2014-11-11 22:51 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2014-11-11 22:51 UTC (permalink / raw)
To: Thomas Ackermann; +Cc: git
Thomas Ackermann <th.acker@arcor.de> writes:
> Signed-off-by: Thomas Ackermann <th.acker@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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gittutorial.txt: remove reference to ancient Git version
2014-11-12 8:57 Aw: " Thomas Ackermann
@ 2014-11-12 9:12 ` Stefan Näwe
2014-11-12 9:20 ` Stefan Näwe
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Näwe @ 2014-11-12 9:12 UTC (permalink / raw)
To: Thomas Ackermann, gitster@pobox.com; +Cc: git@vger.kernel.org
-----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-----
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gittutorial.txt: remove reference to ancient Git version
2014-11-12 9:12 ` Stefan Näwe
@ 2014-11-12 9:20 ` Stefan Näwe
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Näwe @ 2014-11-12 9:20 UTC (permalink / raw)
To: Thomas Ackermann, gitster@pobox.com; +Cc: git@vger.kernel.org
-----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-----
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-11-12 9:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-11 19:13 [PATCH] gittutorial.txt: remove reference to ancient Git version Thomas Ackermann
2014-11-11 22:51 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2014-11-12 8:57 Aw: " Thomas Ackermann
2014-11-12 9:12 ` Stefan Näwe
2014-11-12 9:20 ` Stefan Näwe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).