-----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 majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html