Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: A few minor fixes to Git User's Manual
author
Jakub Narebski
<jnareb@gmail.com>
Tue, 3 Apr 2007 16:27:28 +0000
(18:27 +0200)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 4 Apr 2007 02:04:56 +0000
(19:04 -0700)
Mainly consistent usage of "git command" and not "git-command" syntax
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/user-manual.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
bbf4b41
)
diff --git
a/Documentation/user-manual.txt
b/Documentation/user-manual.txt
index 1c49e6995b42e42f1aba4e7b24d073e50c3b5234..574e9c0e50d324ead7262e1f6b3bde72d5969350 100644
(file)
--- a/
Documentation/user-manual.txt
+++ b/
Documentation/user-manual.txt
@@
-84,7
+84,7
@@
$ git branch -r # list
origin/master
origin/next
...
origin/master
origin/next
...
-$ git
branch
checkout -b masterwork origin/master
+$ git checkout -b masterwork origin/master
-----------------------------------------------
Fetch a branch from a different repository, and give it a new
-----------------------------------------------
Fetch a branch from a different repository, and give it a new
@@
-155,8
+155,8
@@
Make sure git knows who to blame:
------------------------------------------------
$ cat >~/.gitconfig <<\EOF
[user]
------------------------------------------------
$ cat >~/.gitconfig <<\EOF
[user]
-name = Your Name Comes Here
-email = you@yourdomain.example.com
+
name = Your Name Comes Here
+
email = you@yourdomain.example.com
EOF
------------------------------------------------
EOF
------------------------------------------------
@@
-195,7
+195,7
@@
Importing or exporting patches:
-----------------------------------------------
$ git format-patch origin..HEAD # format a patch for each commit
# in HEAD but not in origin
-----------------------------------------------
$ git format-patch origin..HEAD # format a patch for each commit
# in HEAD but not in origin
-$ git
-
am mbox # import patches from the mailbox "mbox"
+$ git
am mbox # import patches from the mailbox "mbox"
-----------------------------------------------
Fetch a branch in a different git repository, then merge into the
-----------------------------------------------
Fetch a branch in a different git repository, then merge into the
@@
-579,7
+579,7
@@
cloned from, using gitlink:git-remote[1]:
-------------------------------------------------
$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
-------------------------------------------------
$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
-$ git fetch
+$ git fetch
linux-nfs
* refs/remotes/linux-nfs/master: storing branch 'master' ...
commit: bf81b46
-------------------------------------------------
* refs/remotes/linux-nfs/master: storing branch 'master' ...
commit: bf81b46
-------------------------------------------------
@@
-680,7
+680,7
@@
occasionally you may land on a commit that broke something unrelated;
run
-------------------------------------------------
run
-------------------------------------------------
-$ git bisect
-
visualize
+$ git bisect
visualize
-------------------------------------------------
which will run gitk and label the commit it chose with a marker that
-------------------------------------------------
which will run gitk and label the commit it chose with a marker that
@@
-765,7
+765,7
@@
We can also create a tag to refer to a particular commit; after
running
-------------------------------------------------
running
-------------------------------------------------
-$ git
-
tag stable-1 1b2e1d63ff
+$ git
tag stable-1 1b2e1d63ff
-------------------------------------------------
You can use stable-1 to refer to the commit 1b2e1d63ff.
-------------------------------------------------
You can use stable-1 to refer to the commit 1b2e1d63ff.
@@
-909,7
+909,7
@@
name based on any tag it finds pointing to one of the commit's
descendants:
-------------------------------------------------
descendants:
-------------------------------------------------
-$ git name-rev e05db0fd
+$ git name-rev
--tags
e05db0fd
e05db0fd tags/v1.5.0-rc1^0~23
-------------------------------------------------
e05db0fd tags/v1.5.0-rc1^0~23
-------------------------------------------------
@@
-918,7
+918,7
@@
revision using a tag on which the given commit is based:
-------------------------------------------------
$ git describe e05db0fd
-------------------------------------------------
$ git describe e05db0fd
-v1.5.0-rc0-ge05db0f
+v1.5.0-rc0-
260-
ge05db0f
-------------------------------------------------
but that may sometimes help you guess which tags might come after the
-------------------------------------------------
but that may sometimes help you guess which tags might come after the
@@
-1861,7
+1861,7
@@
Allow web browsing of a repository
The gitweb cgi script provides users an easy way to browse your
project's files and history without having to install git; see the file
The gitweb cgi script provides users an easy way to browse your
project's files and history without having to install git; see the file
-gitweb/
README
in the git source tree for instructions on setting it up.
+gitweb/
INSTALL
in the git source tree for instructions on setting it up.
Examples
--------
Examples
--------