projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.12.0
[platform/upstream/git.git]
/
Documentation
/
gittutorial.txt
diff --git
a/Documentation/gittutorial.txt
b/Documentation/gittutorial.txt
index
8262196
..
794b833
100644
(file)
--- a/
Documentation/gittutorial.txt
+++ b/
Documentation/gittutorial.txt
@@
-3,7
+3,7
@@
gittutorial(7)
NAME
----
NAME
----
-gittutorial - A tutorial introduction to Git
(for version 1.5.1 or newer)
+gittutorial - A tutorial introduction to Git
SYNOPSIS
--------
SYNOPSIS
--------
@@
-107,14
+107,15
@@
summary of the situation with 'git status':
------------------------------------------------
$ 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
+
------------------------------------------------
If you need to make any further adjustments, do so now, and then add any
------------------------------------------------
If you need to make any further adjustments, do so now, and then add any
@@
-450,7
+451,7
@@
perform clones and pulls using the ssh protocol:
bob$ git clone alice.org:/home/alice/project myrepo
-------------------------------------
bob$ git clone alice.org:/home/alice/project myrepo
-------------------------------------
-Alternatively, Git has a native protocol, or can use
rsync or
http;
+Alternatively, Git has a native protocol, or can use http;
see linkgit:git-pull[1] for details.
Git can also be used in a CVS-like mode, with a central repository
see linkgit:git-pull[1] for details.
Git can also be used in a CVS-like mode, with a central repository
@@
-656,7
+657,7
@@
digressions that may be interesting at this point are:
* linkgit:gitworkflows[7]: Gives an overview of recommended
workflows.
* linkgit:gitworkflows[7]: Gives an overview of recommended
workflows.
- * link
:everyday.html[Everyday Git with 20 Commands Or So]
+ * link
git:giteveryday[7]: Everyday Git with 20 Commands Or So.
* linkgit:gitcvs-migration[7]: Git for CVS users.
* linkgit:gitcvs-migration[7]: Git for CVS users.
@@
-668,9
+669,9
@@
linkgit:gitcore-tutorial[7],
linkgit:gitglossary[7],
linkgit:git-help[1],
linkgit:gitworkflows[7],
linkgit:gitglossary[7],
linkgit:git-help[1],
linkgit:gitworkflows[7],
-link
:everyday.html[Everyday Git
],
+link
git:giteveryday[7
],
link:user-manual.html[The Git User's Manual]
GIT
---
link:user-manual.html[The Git User's Manual]
GIT
---
-Part of the linkgit:git[1] suite
.
+Part of the linkgit:git[1] suite