summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2fd02c9)
raw | patch | inline | side by side (parent: 2fd02c9)
author | Jonathan Nieder <jrnieder@uchicago.edu> | |
Thu, 3 Jul 2008 05:59:09 +0000 (00:59 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 5 Jul 2008 18:24:40 +0000 (11:24 -0700) |
Italicize those git subcommand names already in teletype we missed.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
index f7a54f65b04c5eff5e75328a3a48e8e1e9724806..a403d46c1ba3068abe5c0583533de651f6116fd4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
See linkgit:git-update-index[1]. True by default.
core.quotepath::
- The commands that output paths (e.g. `ls-files`,
- `diff`), when not given the `-z` option, will quote
+ The commands that output paths (e.g. 'ls-files',
+ 'diff'), when not given the `-z` option, will quote
"unusual" characters in the pathname by enclosing the
pathname in a double-quote pair and with backslashes the
same way strings in C source code are quoted. If this
contents in the work tree match the contents in the
index. This option defaults to true. Note that this
affects only 'git-diff' Porcelain, and not lower level
- `diff` commands, such as 'git-diff-files'.
+ 'diff' commands, such as 'git-diff-files'.
diff.external::
If this config variable is set, diff generation is not
prevent `git pack-refs` from being run from 'git-gc'.
gc.pruneexpire::
- When 'git-gc' is run, it will call `prune --expire 2.weeks.ago`.
+ When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'.
Override the grace period with this config variable.
gc.reflogexpire::
index dc5b8f6c8403e9a58bd2d88d76fc43e152864f89..e7c0f1c959d39739e177096875dd8aac5fd185d9 100644 (file)
For the sake of simplicity and interoperating with a less-capable system
(SVN), it is recommended that all 'git-svn' users clone, fetch and dcommit
-directly from the SVN server, and avoid all 'git-clone'/`pull`/`merge`/`push`
+directly from the SVN server, and avoid all 'git-clone'/'pull'/'merge'/'push'
operations between git repositories and branches. The recommended
method of exchanging code between git branches and users is
'git-format-patch' and 'git-am', or just 'dcommit'ing to the SVN repository.
index 5acdeb7b8bef58d5a5791fa9d16a385bbc8396ff..dd6a26827fe0719d9f184fff91cba9e2b917d1ea 100644 (file)
------------
Oops. That wasn't very readable. It just spit out its own internal
-version of a `diff`, but that internal version really just tells you
+version of a 'diff', but that internal version really just tells you
that it has noticed that "hello" has been modified, and that the old object
contents it had have been replaced with something else.
While creating changes is useful, it's even more useful if you can tell
later what changed. The most useful command for this is another of the
-`diff` family, namely 'git-diff-tree'.
+'diff' family, namely 'git-diff-tree'.
'git-diff-tree' can be given two arbitrary trees, and it will tell you the
differences between them. Perhaps even more commonly, though, you can
often called 'fast forward' merge.
You can run `gitk \--all` again to see how the commit ancestry
-looks like, or run `show-branch`, which tells you this.
+looks like, or run 'show-branch', which tells you this.
------------------------------------------------
$ git show-branch master mybranch
index 2737d10aad1f0663eafe3ef3235be71a86c9f709..2eb6972a93f1033281b79fe03af6d80c06d576dc 100644 (file)
[NOTE]
================================
-The `pull` command knows where to get updates from because of certain
+The 'pull' command knows where to get updates from because of certain
configuration variables that were set by the first 'git-clone'
command; see `git config -l` and the linkgit:git-config[1] man
page for details.
In the 'git-push' command above we specify the name of the remote branch
to update (`master`). If we leave that out, 'git-push' tries to update
any branches in the remote repository that have the same name as a branch
-in the local repository. So the last `push` can be done with either of:
+in the local repository. So the last 'push' can be done with either of:
------------
$ git push origin