Permalink
Browse files

Autogenerated HTML docs for v1.7.10.1-433-g34875

  • Loading branch information...
1 parent 0aadbc3 commit b76a68630eaab75c4eb1c41f0fc091811854ff43 @gitster committed May 2, 2012
Showing with 474 additions and 406 deletions.
  1. +42 −32 RelNotes/1.7.11.txt
  2. +40 −22 config.txt
  3. +1 −1 diff-generate-patch.txt
  4. +1 −1 diff-options.txt
  5. +2 −2 everyday.txt
  6. +2 −2 git-archive.html
  7. +1 −1 git-archive.txt
  8. +2 −2 git-blame.html
  9. +1 −1 git-blame.txt
  10. +5 −5 git-bundle.html
  11. +4 −4 git-bundle.txt
  12. +9 −9 git-check-ref-format.html
  13. +6 −6 git-check-ref-format.txt
  14. +3 −3 git-checkout.html
  15. +4 −4 git-checkout.txt
  16. +2 −2 git-cherry-pick.html
  17. +2 −2 git-cherry-pick.txt
  18. +3 −3 git-commit.html
  19. +2 −2 git-commit.txt
  20. +34 −16 git-config.html
  21. +1 −1 git-cvsserver.txt
  22. +3 −3 git-diff-files.html
  23. +3 −3 git-diff-index.html
  24. +5 −5 git-diff-tree.html
  25. +3 −3 git-diff.html
  26. +2 −2 git-fast-export.html
  27. +1 −1 git-fast-export.txt
  28. +10 −10 git-fast-import.html
  29. +3 −3 git-fast-import.txt
  30. +1 −1 git-fetch.html
  31. +6 −6 git-filter-branch.html
  32. +17 −17 git-filter-branch.txt
  33. +2 −2 git-format-patch.html
  34. +2 −2 git-format-patch.txt
  35. +1 −1 git-gc.txt
  36. +3 −3 git-grep.html
  37. +2 −2 git-grep.txt
  38. +12 −12 git-log.html
  39. +1 −1 git-log.txt
  40. +1 −1 git-notes.txt
  41. +1 −1 git-pack-refs.txt
  42. +3 −3 git-pull.html
  43. +1 −1 git-pull.txt
  44. +7 −7 git-push.html
  45. +7 −7 git-push.txt
  46. +5 −5 git-rebase.txt
  47. +3 −3 git-reflog.txt
  48. +5 −5 git-remote-helpers.html
  49. +4 −4 git-remote-helpers.txt
  50. +3 −3 git-remote.txt
  51. +4 −4 git-rerere.html
  52. +3 −3 git-rerere.txt
  53. +3 −3 git-reset.html
  54. +1 −1 git-reset.txt
  55. +8 −8 git-rev-list.html
  56. +4 −5 git-rev-parse.html
  57. +3 −4 git-rev-parse.txt
  58. +2 −2 git-revert.html
  59. +2 −2 git-revert.txt
  60. +2 −3 git-rm.html
  61. +1 −2 git-rm.txt
  62. +2 −2 git-shortlog.html
  63. +1 −1 git-shortlog.txt
  64. +2 −2 git-show-ref.html
  65. +1 −1 git-show-ref.txt
  66. +2 −2 git-show.html
  67. +2 −2 git-show.txt
  68. +3 −3 git-stash.html
  69. +9 −9 git-stash.txt
  70. +2 −2 git-status.html
  71. +2 −2 git-status.txt
  72. +2 −2 git-tar-tree.html
  73. +1 −1 git-tar-tree.txt
  74. +12 −3 git-update-index.html
  75. +5 −1 git-update-index.txt
  76. +2 −2 git-whatchanged.html
  77. +1 −1 git-whatchanged.txt
  78. +6 −6 gitcli.txt
  79. +12 −12 gitcore-tutorial.html
  80. +16 −16 gitcore-tutorial.txt
  81. +2 −2 gitcredentials.html
  82. +2 −2 gitcredentials.txt
  83. +2 −2 gitdiffcore.html
  84. +5 −5 gitdiffcore.txt
  85. +4 −4 githooks.txt
  86. +3 −3 gitweb.conf.html
  87. +6 −6 gitweb.conf.txt
  88. +2 −2 gitworkflows.txt
  89. +3 −3 pretty-formats.txt
  90. +1 −1 pull-fetch-param.txt
  91. +3 −3 rev-list-options.txt
  92. +3 −3 technical/api-parse-options.html
  93. +18 −18 technical/api-parse-options.txt
  94. +13 −0 technical/index-format.txt
  95. +1 −1 technical/protocol-common.txt
  96. +2 −2 user-manual.html
  97. +4 −4 user-manual.txt
View
74 RelNotes/1.7.11.txt
@@ -6,6 +6,13 @@ Updates since v1.7.10
UI, Workflows & Features
+ * A new mode for push, "simple", which is a cross between "current"
+ and "upstream", has been introduced. "git push" without any refspec
+ will push the current branch out to the same name at the remote
+ repository only when it is set to track the branch with the same
+ name over there. The plan is to make this mode the new default
+ value when push.default is not configured.
+
* A third-party tool "git subtree" is distributed in contrib/
* Error messages given when @{u} is used for a branch without its
@@ -30,12 +37,18 @@ UI, Workflows & Features
needed such treatment are now reported to the end user, so that the
result in them can be eyeballed with extra care.
+ * The output from "diff/log --stat" used to always allocate 4 columns
+ to show the number of modified lines, but not anymore.
+
* The "fmt-merge-msg" command learns to list the primary contributors
involved in the side topic you are merging.
* The cases "git push" fails due to non-ff can be broken into three
categories; each case is given a separate advise message.
+ * "git rebase" learned to optionally keep commits that do not
+ introduce any change in the original history.
+
* "git push --recurse-submodules" learned to optionally look into the
histories of submodules bound to the superproject and push them
out.
@@ -53,9 +66,18 @@ Foreign Interface
* "git svn" learned to use platform specific authentication
providers, e.g. gnome-keyring, kwallet, etc.
- * "git p4" has been moved out of contrib/ area.
+ * "git p4" has been moved out of contrib/ area and has seen more work
+ on importing labels as tags from (and exporting tags as labels to)
+ p4.
-Performance
+Performance and Internal Implementation (please report possible regressions)
+
+ * An experimental "version 4" format of the index file has been
+ introduced to reduce on-disk footprint and I/O overhead.
+
+ * The code to compute hash values for lines used by the internal diff
+ engine was optimized on little-endian machines, using the same
+ trick the kernel folks came up with.
* "git apply" had some memory leaks plugged.
@@ -68,8 +90,6 @@ Performance
one-by-one. Now they are collected in the queue unordered first,
and sorted immediately before getting used.
-Internal Implementation (please report possible regressions)
-
* "git rev-parse --show-prefix" used to emit nothing when run at the
top-level of the working tree, but now it gives a blank line.
@@ -96,6 +116,24 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
releases are contained in this release (see release notes to them for
details).
+ * When using a Perl script on a system where "perl" found on user's
+ $PATH could be ancient or otherwise broken, we allow builders to
+ specify the path to a good copy of Perl with $PERL_PATH. The
+ gitweb test forgot to use that Perl when running its test.
+ (merge 0754e08 jk/maint-gitweb-test-use-sane-perl later to maint).
+
+ * A contrib script "rerere-train" did not work out of the box unless
+ user futzed with her $PATH.
+ (merge 53876fc jc/rerere-train later to maint).
+
+ * "log --graph" was not very friendly with "--stat" option and its
+ output had line breaks at wrong places.
+ (merge bafa16e lp/diffstat-with-graph later to maint).
+
+ * "git config --rename-section" to rename an existing section into a
+ bogus one did not check the new name.
+ (merge 94a35b1 jk/maint-config-bogus-section later to maint).
+
* The test scaffolding for git-daemon was flaky.
(merge 46e3581 js/daemon-test-race-fix later to maint).
@@ -136,31 +174,3 @@ details).
* The "diff --no-index" codepath used limited-length buffers, risking
pathnames getting truncated. Update it to use the strbuf API.
(merge 875b91b jm/maint-strncpy-diff-no-index later to maint).
-
- * The parser in "fast-import" did not diagnose ":9" style references
- that is not followed by required SP/LF as an error.
- (merge 06454cb pw/fast-import-dataref-parsing later to maint).
-
- * When "git fetch" encounters repositories with too many references,
- the command line of "fetch-pack" that is run by a helper
- e.g. remote-curl, may fail to hold all of them. Now such an
- internal invocation can feed the references through the standard
- input of "fetch-pack".
- (merge 7103d25 it/fetch-pack-many-refs later to maint).
-
- * "git fetch" that recurses into submodules on demand did not check
- if it needs to go into submodules when non branches (most notably,
- tags) are fetched.
- (merge a6801ad jl/maint-submodule-recurse-fetch later to maint).
-
- * "git blame" started missing quite a few changes from the origin
- since we stopped using the diff minimalization by default in v1.7.2
- era.
- (merge 059a500 jc/maint-blame-minimal later to maint).
-
- * "log -p --graph" used with "--stat" had a few formatting error.
- (merge e2c5966 lp/maint-diff-three-dash-with-graph later to maint).
-
- * Giving "--continue" to a conflicted "rebase -i" session skipped a
- commit that only results in changes to submodules.
- (merge a6754cd jk/rebase-i-submodule-conflict-only later to maint).
View
62 config.txt
@@ -481,8 +481,8 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
core.excludesfile::
In addition to '.gitignore' (per-directory) and
'.git/info/exclude', git looks into this file for patterns
- of files which are not meant to be tracked. "{tilde}/" is expanded
- to the value of `$HOME` and "{tilde}user/" to the specified user's
+ of files which are not meant to be tracked. "`~/`" is expanded
+ to the value of `$HOME` and "`~user/`" to the specified user's
home directory. See linkgit:gitignore[5].
core.askpass::
@@ -863,7 +863,7 @@ commit.status::
commit.template::
Specify a file to use as the template for new commit messages.
- "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
+ "`~/`" is expanded to the value of `$HOME` and "`~user/`" to the
specified user's home directory.
credential.helper::
@@ -988,7 +988,7 @@ format.thread::
a boolean value, or `shallow` or `deep`. `shallow` threading
makes every mail a reply to the head of the series,
where the head is chosen from the cover letter, the
- `\--in-reply-to`, and the first patch mail, in this order.
+ `--in-reply-to`, and the first patch mail, in this order.
`deep` threading makes every mail a reply to the previous one.
A true boolean value is the same as `shallow`, and a false
value disables threading.
@@ -1419,21 +1419,21 @@ instaweb.port::
interactive.singlekey::
In interactive commands, allow the user to provide one-letter
input with a single key (i.e., without hitting enter).
- Currently this is used by the `\--patch` mode of
+ Currently this is used by the `--patch` mode of
linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
setting is silently ignored if portable keystroke input
is not available.
log.abbrevCommit::
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
- linkgit:git-whatchanged[1] assume `\--abbrev-commit`. You may
- override this option with `\--no-abbrev-commit`.
+ linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may
+ override this option with `--no-abbrev-commit`.
log.date::
Set the default date-time mode for the 'log' command.
Setting a value for log.date is similar to using 'git log''s
- `\--date` option. Possible values are `relative`, `local`,
+ `--date` option. Possible values are `relative`, `local`,
`default`, `iso`, `rfc`, and `short`; see linkgit:git-log[1]
for details.
@@ -1623,18 +1623,18 @@ pack.indexVersion::
and this config option ignored whenever the corresponding pack is
larger than 2 GB.
+
-If you have an old git that does not understand the version 2 `{asterisk}.idx` file,
+If you have an old git that does not understand the version 2 `*.idx` file,
cloning or fetching over a non native protocol (e.g. "http" and "rsync")
-that will copy both `{asterisk}.pack` file and corresponding `{asterisk}.idx` file from the
+that will copy both `*.pack` file and corresponding `*.idx` file from the
other side may give you a repository that cannot be accessed with your
-older version of git. If the `{asterisk}.pack` file is smaller than 2 GB, however,
+older version of git. If the `*.pack` file is smaller than 2 GB, however,
you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
-the `{asterisk}.idx` file.
+the `*.idx` file.
pack.packSizeLimit::
The maximum size of a pack. This setting only affects
packing to a file when repacking, i.e. the git:// protocol
- is unaffected. It can be overridden by the `\--max-pack-size`
+ is unaffected. It can be overridden by the `--max-pack-size`
option of linkgit:git-repack[1]. The minimum size allowed is
limited to 1 MiB. The default is unlimited.
Common unit suffixes of 'k', 'm', or 'g' are
@@ -1644,18 +1644,18 @@ pager.<cmd>::
If the value is boolean, turns on or off pagination of the
output of a particular git subcommand when writing to a tty.
Otherwise, turns on pagination for the subcommand using the
- pager specified by the value of `pager.<cmd>`. If `\--paginate`
- or `\--no-pager` is specified on the command line, it takes
+ pager specified by the value of `pager.<cmd>`. If `--paginate`
+ or `--no-pager` is specified on the command line, it takes
precedence over this option. To disable pagination for all
commands, set `core.pager` or `GIT_PAGER` to `cat`.
pretty.<name>::
Alias for a --pretty= format string, as specified in
linkgit:git-log[1]. Any aliases defined here can be used just
as the built-in pretty formats could. For example,
- running `git config pretty.changelog "format:{asterisk} %H %s"`
+ running `git config pretty.changelog "format:* %H %s"`
would cause the invocation `git log --pretty=changelog`
- to be equivalent to running `git log "--pretty=format:{asterisk} %H %s"`.
+ to be equivalent to running `git log "--pretty=format:* %H %s"`.
Note that an alias with the same name as a built-in format
will be silently ignored.
@@ -1683,12 +1683,30 @@ push.default::
line. Possible values are:
+
* `nothing` - do not push anything.
-* `matching` - push all matching branches.
- All branches having the same name in both ends are considered to be
- matching. This is the default.
+* `matching` - push all branches having the same name in both ends.
+ This is for those who prepare all the branches into a publishable
+ shape and then push them out with a single command. It is not
+ appropriate for pushing into a repository shared by multiple users,
+ since locally stalled branches will attempt a non-fast forward push
+ if other users updated the branch.
+ +
+ This is currently the default, but Git 2.0 will change the default
+ to `simple`.
* `upstream` - push the current branch to its upstream branch.
-* `tracking` - deprecated synonym for `upstream`.
+ With this, `git push` will update the same remote ref as the one which
+ is merged by `git pull`, making `push` and `pull` symmetrical.
+ See "branch.<name>.merge" for how to configure the upstream branch.
+* `simple` - like `upstream`, but refuses to push if the upstream
+ branch's name is different from the local one. This is the safest
+ option and is well-suited for beginners. It will become the default
+ in Git 2.0.
* `current` - push the current branch to a branch of the same name.
+ +
+ The `simple`, `current` and `upstream` modes are for those who want to
+ push out a single branch after finishing work, even when the other
+ branches are not yet ready to be pushed out. If you are working with
+ other people to push into the same shared repository, you would want
+ to use one of these.
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
@@ -1768,7 +1786,7 @@ remote.<name>.push::
remote.<name>.mirror::
If true, pushing to this remote will automatically behave
- as if the `\--mirror` option was given on the command line.
+ as if the `--mirror` option was given on the command line.
remote.<name>.skipDefaultUpdate::
If true, this remote will be skipped by default when updating
View
2 diff-generate-patch.txt
@@ -175,7 +175,7 @@ In the above example output, the function signature was changed
from both files (hence two `-` removals from both file1 and
file2, plus `++` to mean one line that was added does not appear
in either file1 nor file2). Also eight other lines are the same
-from file1 but do not appear in file2 (hence prefixed with `{plus}`).
+from file1 but do not appear in file2 (hence prefixed with `+`).
When shown by `git diff-tree -c`, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
View
2 diff-options.txt
@@ -74,7 +74,7 @@ These parameters can also be set individually with `--stat-width=<width>`,
`--stat-name-width=<name-width>` and `--stat-count=<count>`.
--numstat::
- Similar to `\--stat`, but shows number of added and
+ Similar to `--stat`, but shows number of added and
deleted lines in decimal notation and pathname without
abbreviation, to make it more machine friendly. For
binary files, outputs two `-` instead of saying
View
4 everyday.txt
@@ -98,8 +98,8 @@ you originally wrote.
<9> switch to the master branch.
<10> merge a topic branch into your master branch.
<11> review commit logs; other forms to limit output can be
-combined and include `\--max-count=10` (show 10 commits),
-`\--until=2005-12-10`, etc.
+combined and include `--max-count=10` (show 10 commits),
+`--until=2005-12-10`, etc.
<12> view only the changes that touch what's in `curses/`
directory, since `v2.43` tag.
View
4 git-archive.html
@@ -854,7 +854,7 @@ <h2 id="_examples">EXAMPLES</h2>
</p>
</dd>
<dt class="hdlist1">
-<tt>git archive --format=tar --prefix=git-1.4.0/ v1.4.0&#94;{tree} | gzip &gt;git-1.4.0.tar.gz</tt>
+<tt>git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip &gt;git-1.4.0.tar.gz</tt>
</dt>
<dd>
<p>
@@ -905,7 +905,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
2 git-archive.txt
@@ -160,7 +160,7 @@ EXAMPLES
Same as above, but the format is inferred from the output file.
-`git archive --format=tar --prefix=git-1.4.0/ v1.4.0{caret}\{tree\} | gzip >git-1.4.0.tar.gz`::
+`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`::
Create a compressed tarball for v1.4.0 release, but without a
global extended pax header.
View
4 git-blame.html
@@ -1018,7 +1018,7 @@ <h2 id="_specifying_ranges">SPECIFYING RANGES</h2>
<pre><tt>git log --diff-filter=A --pretty=short -- foo</tt></pre>
</div></div>
<div class="paragraph"><p>and then annotate the change between the commit and its
-parents, using <tt>commit&#94;!</tt> notation:</p></div>
+parents, using <tt>commit^!</tt> notation:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git blame -C -C -f $commit^! -- foo</tt></pre>
@@ -1166,7 +1166,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
2 git-blame.txt
@@ -160,7 +160,7 @@ introduced the file with:
git log --diff-filter=A --pretty=short -- foo
and then annotate the change between the commit and its
-parents, using `commit{caret}!` notation:
+parents, using `commit^!` notation:
git blame -C -C -f $commit^! -- foo
View
10 git-bundle.html
@@ -660,7 +660,7 @@ <h2 id="_options">OPTIONS</h2>
A list of arguments, acceptable to <em>git rev-parse</em> and
<em>git rev-list</em> (and containing a named ref, see SPECIFYING REFERENCES
below), that specifies the specific objects and references
- to transport. For example, <tt>master&#126;10..master</tt> causes the
+ to transport. For example, <tt>master~10..master</tt> causes the
current master reference to be packaged along with all objects
added since its 10th ancestor commit. There is no explicit
limit to the number of references and objects that may be
@@ -685,12 +685,12 @@ <h2 id="_specifying_references">SPECIFYING REFERENCES</h2>
<div class="sectionbody">
<div class="paragraph"><p><em>git bundle</em> will only package references that are shown by
<em>git show-ref</em>: this includes heads, tags, and remote heads. References
-such as <tt>master&#126;1</tt> cannot be packaged, but are perfectly suitable for
+such as <tt>master~1</tt> cannot be packaged, but are perfectly suitable for
defining the basis. More than one reference may be packaged, and more
than one basis can be specified. The objects packaged are those not
contained in the union of the given bases. Each basis can be
-specified explicitly (e.g. <tt>^master&#126;10</tt>), or implicitly (e.g.
-<tt>master&#126;10..master</tt>, <tt>--since=10.days.ago master</tt>).</p></div>
+specified explicitly (e.g. <tt>^master~10</tt>), or implicitly (e.g.
+<tt>master~10..master</tt>, <tt>--since=10.days.ago master</tt>).</p></div>
<div class="paragraph"><p>It is very important that the basis used be held by the destination.
It is okay to err on the side of caution, causing the bundle file
to contain objects already in the destination, as these are ignored
@@ -798,7 +798,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
8 git-bundle.txt
@@ -61,7 +61,7 @@ unbundle <file>::
A list of arguments, acceptable to 'git rev-parse' and
'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES
below), that specifies the specific objects and references
- to transport. For example, `master{tilde}10..master` causes the
+ to transport. For example, `master~10..master` causes the
current master reference to be packaged along with all objects
added since its 10th ancestor commit. There is no explicit
limit to the number of references and objects that may be
@@ -80,12 +80,12 @@ SPECIFYING REFERENCES
'git bundle' will only package references that are shown by
'git show-ref': this includes heads, tags, and remote heads. References
-such as `master{tilde}1` cannot be packaged, but are perfectly suitable for
+such as `master~1` cannot be packaged, but are perfectly suitable for
defining the basis. More than one reference may be packaged, and more
than one basis can be specified. The objects packaged are those not
contained in the union of the given bases. Each basis can be
-specified explicitly (e.g. `^master{tilde}10`), or implicitly (e.g.
-`master{tilde}10..master`, `--since=10.days.ago master`).
+specified explicitly (e.g. `^master~10`), or implicitly (e.g.
+`master~10..master`, `--since=10.days.ago master`).
It is very important that the basis used be held by the destination.
It is okay to err on the side of caution, causing the bundle file
View
18 git-check-ref-format.html
@@ -626,12 +626,12 @@ <h2 id="_description">DESCRIPTION</h2>
<p>
They cannot have ASCII control characters (i.e. bytes whose
values are lower than \040, or \177 <tt>DEL</tt>), space, tilde <tt>~</tt>,
- caret <tt>&#94;</tt>, or colon <tt>:</tt> anywhere.
+ caret <tt>^</tt>, or colon <tt>:</tt> anywhere.
</p>
</li>
<li>
<p>
-They cannot have question-mark <tt>?</tt>, asterisk <tt>&#42;</tt>, or open
+They cannot have question-mark <tt>?</tt>, asterisk <tt>*</tt>, or open
bracket <tt>[</tt> anywhere. See the <tt>--refspec-pattern</tt> option below for
an exception to this rule.
</p>
@@ -667,13 +667,13 @@ <h2 id="_description">DESCRIPTION</h2>
<li>
<p>
A double-dot <tt>..</tt> is often used as in <tt>ref1..ref2</tt>, and in some
- contexts this notation means <tt>&#94;ref1 ref2</tt> (i.e. not in
+ contexts this notation means <tt>^ref1 ref2</tt> (i.e. not in
<tt>ref1</tt> and in <tt>ref2</tt>).
</p>
</li>
<li>
<p>
-A tilde <tt>~</tt> and caret <tt>&#94;</tt> are used to introduce the postfix
+A tilde <tt>~</tt> and caret <tt>^</tt> are used to introduce the postfix
<em>nth parent</em> and <em>peel onion</em> operation.
</p>
</li>
@@ -691,8 +691,8 @@ <h2 id="_description">DESCRIPTION</h2>
</p>
</li>
</ol></div>
-<div class="paragraph"><p>With the <tt>--branch</tt> option, it expands the &#8220;previous branch syntax&#8221;
-<tt>@{-n}</tt>. For example, <tt>@{-1}</tt> is a way to refer the last branch you
+<div class="paragraph"><p>With the <tt>--branch</tt> option, it expands the <tt>`previous branch syntax''
+`@{-n}</tt>. For example, <tt>@{-1}</tt> is a way to refer the last branch you
were on. This option should be used by porcelains to accept this
syntax anywhere a branch name is expected, so they can act as if you
typed the branch name.</p></div>
@@ -720,9 +720,9 @@ <h2 id="_options">OPTIONS</h2>
<p>
Interpret &lt;refname&gt; as a reference name pattern for a refspec
(as used with remote repositories). If this option is
- enabled, &lt;refname&gt; is allowed to contain a single <tt>&#42;</tt>
+ enabled, &lt;refname&gt; is allowed to contain a single <tt>*</tt>
in place of a one full pathname component (e.g.,
- <tt>foo/&#42;/bar</tt> but not <tt>foo/bar&#42;</tt>).
+ <tt>foo/*/bar</tt> but not <tt>foo/bar*</tt>).
</p>
</dd>
<dt class="hdlist1">
@@ -772,7 +772,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
12 git-check-ref-format.txt
@@ -40,9 +40,9 @@ git imposes the following rules on how references are named:
. They cannot have ASCII control characters (i.e. bytes whose
values are lower than \040, or \177 `DEL`), space, tilde `~`,
- caret `{caret}`, or colon `:` anywhere.
+ caret `^`, or colon `:` anywhere.
-. They cannot have question-mark `?`, asterisk `{asterisk}`, or open
+. They cannot have question-mark `?`, asterisk `*`, or open
bracket `[` anywhere. See the `--refspec-pattern` option below for
an exception to this rule.
@@ -62,10 +62,10 @@ unquoted (by mistake), and also avoids ambiguities in certain
reference name expressions (see linkgit:gitrevisions[7]):
. A double-dot `..` is often used as in `ref1..ref2`, and in some
- contexts this notation means `{caret}ref1 ref2` (i.e. not in
+ contexts this notation means `^ref1 ref2` (i.e. not in
`ref1` and in `ref2`).
-. A tilde `~` and caret `{caret}` are used to introduce the postfix
+. A tilde `~` and caret `^` are used to introduce the postfix
'nth parent' and 'peel onion' operation.
. A colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
@@ -92,9 +92,9 @@ OPTIONS
--refspec-pattern::
Interpret <refname> as a reference name pattern for a refspec
(as used with remote repositories). If this option is
- enabled, <refname> is allowed to contain a single `{asterisk}`
+ enabled, <refname> is allowed to contain a single `*`
in place of a one full pathname component (e.g.,
- `foo/{asterisk}/bar` but not `foo/bar{asterisk}`).
+ `foo/*/bar` but not `foo/bar*`).
--normalize::
Normalize 'refname' by removing any leading slash (`/`)
View
6 git-checkout.html
@@ -840,8 +840,8 @@ <h2 id="_options">OPTIONS</h2>
working tree (and if a &lt;tree-ish&gt; was specified, the index).
</p>
<div class="paragraph"><p>This means that you can use <tt>git checkout -p</tt> to selectively discard
-edits from your current working tree. See the &#8220;Interactive Mode&#8221;
-section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div>
+edits from your current working tree. See the <tt>`Interactive Mode''
+section of linkgit:git-add[1] to learn how to operate the `--patch</tt> mode.</p></div>
</dd>
<dt class="hdlist1">
&lt;branch&gt;
@@ -1129,7 +1129,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
8 git-checkout.txt
@@ -184,7 +184,7 @@ the conflicted merge in the specified paths.
+
This means that you can use `git checkout -p` to selectively discard
edits from your current working tree. See the ``Interactive Mode''
-section of linkgit:git-add[1] to learn how to operate the `\--patch` mode.
+section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
<branch>::
Branch to checkout; if it refers to a branch (i.e., a name that,
@@ -193,11 +193,11 @@ section of linkgit:git-add[1] to learn how to operate the `\--patch` mode.
commit, your HEAD becomes "detached" and you are no longer on
any branch (see below for details).
+
-As a special case, the `"@\{-N\}"` syntax for the N-th last branch
+As a special case, the `"@{-N}"` syntax for the N-th last branch
checks out the branch (instead of detaching). You may also specify
-`-` which is synonymous with `"@\{-1\}"`.
+`-` which is synonymous with `"@{-1}"`.
+
-As a further special case, you may use `"A\...B"` as a shortcut for the
+As a further special case, you may use `"A...B"` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
View
4 git-cherry-pick.html
@@ -857,7 +857,7 @@ <h2 id="_examples">EXAMPLES</h2>
</p>
</dd>
<dt class="hdlist1">
-<tt>git cherry-pick master&#126;4 master&#126;2</tt>
+<tt>git cherry-pick master~4 master~2</tt>
</dt>
<dd>
<p>
@@ -953,7 +953,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-04-30 15:35:49 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
4 git-cherry-pick.txt
@@ -149,7 +149,7 @@ EXAMPLES
Apply the changes introduced by all commits that are ancestors
of master but not of HEAD to produce new commits.
-`git cherry-pick master{tilde}4 master{tilde}2`::
+`git cherry-pick master~4 master~2`::
Apply the changes introduced by the fifth and third last
commits pointed to by master and create 2 new commits with
@@ -170,7 +170,7 @@ EXAMPLES
are in next but not HEAD to the current branch, creating a new
commit for each new change.
-`git rev-list --reverse master \-- README | git cherry-pick -n --stdin`::
+`git rev-list --reverse master -- README | git cherry-pick -n --stdin`::
Apply the changes introduced by all commits on the master
branch that touched README to the working tree and index,
View
6 git-commit.html
@@ -632,7 +632,7 @@ <h2 id="_description">DESCRIPTION</h2>
<p>
by using the --interactive or --patch switches with the <em>commit</em> command
to decide one by one which files or hunks should be part of the commit,
- before finalizing the operation. See the <tt>`Interactive Mode</tt>` section of
+ before finalizing the operation. See the &#8220;Interactive Mode&#8221; section of
<a href="git-add.html">git-add(1)</a> to learn how to operate these modes.
</p>
</li>
@@ -778,7 +778,7 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
Override the commit author. Specify an explicit author using the
- standard <tt>A U Thor &lt;<a href="mailto:author@example.com">author@example.com</a>&gt;</tt> format. Otherwise &lt;author&gt;
+ standard <tt>A U Thor &lt;author@example.com&gt;</tt> format. Otherwise &lt;author&gt;
is assumed to be a pattern and is used to search for an existing
commit by that author (i.e. rev-list --all -i --author=&lt;author&gt;);
the commit author is then copied from the first such commit found.
@@ -1307,7 +1307,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-04-16 14:18:39 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
4 git-commit.txt
@@ -42,7 +42,7 @@ The content to be added can be specified in several ways:
5. by using the --interactive or --patch switches with the 'commit' command
to decide one by one which files or hunks should be part of the commit,
- before finalizing the operation. See the ``Interactive Mode`` section of
+ before finalizing the operation. See the ``Interactive Mode'' section of
linkgit:git-add[1] to learn how to operate these modes.
The `--dry-run` option can be used to obtain a
@@ -287,7 +287,7 @@ When recording your own work, the contents of modified files in
your working tree are temporarily stored to a staging area
called the "index" with 'git add'. A file can be
reverted back, only in the index but not in the working tree,
-to that of the last commit with `git reset HEAD \-- <file>`,
+to that of the last commit with `git reset HEAD -- <file>`,
which effectively reverts 'git add' and prevents the changes to
this file from participating in the next commit. After building
the state to be committed incrementally with these commands,
View
50 git-config.html
@@ -1149,8 +1149,8 @@ <h3 id="_includes">Includes</h3><div style="clear:left"></div>
found at the location of the include directive. If the value of the
<tt>include.path</tt> variable is a relative path, the path is considered to be
relative to the configuration file in which the include directive was
-found. The value of <tt>include.path</tt> is subject to tilde expansion: <tt>&#126;/</tt>
-is expanded to the value of <tt>$HOME</tt>, and <tt>&#126;user/</tt> to the specified
+found. The value of <tt>include.path</tt> is subject to tilde expansion: <tt>{tilde}/</tt>
+is expanded to the value of <tt>$HOME</tt>, and <tt>{tilde}user/</tt> to the specified
user&#8217;s home directory. See below for examples.</p></div>
<h3 id="_example">Example</h3><div style="clear:left"></div>
<div class="literalblock">
@@ -1701,8 +1701,8 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
<p>
In addition to <em>.gitignore</em> (per-directory) and
<em>.git/info/exclude</em>, git looks into this file for patterns
- of files which are not meant to be tracked. "&#126;/" is expanded
- to the value of <tt>$HOME</tt> and "&#126;user/" to the specified user&#8217;s
+ of files which are not meant to be tracked. "<tt>~/</tt>" is expanded
+ to the value of <tt>$HOME</tt> and "<tt>~user/</tt>" to the specified user&#8217;s
home directory. See <a href="gitignore.html">gitignore(5)</a>.
</p>
</dd>
@@ -2359,7 +2359,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
<dd>
<p>
Specify a file to use as the template for new commit messages.
- "&#126;/" is expanded to the value of <tt>$HOME</tt> and "&#126;user/" to the
+ "<tt>~/</tt>" is expanded to the value of <tt>$HOME</tt> and "<tt>~user/</tt>" to the
specified user&#8217;s home directory.
</p>
</dd>
@@ -2429,7 +2429,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
A comma separated list of <tt>--dirstat</tt> parameters specifying the
default behavior of the <tt>--dirstat</tt> option to <a href="git-diff.html">git-diff(1)</a>`
and friends. The defaults can be overridden on the command line
- (using <tt>--dirstat=&lt;param1,param2,&#8230;&gt;</tt>). The fallback defaults
+ (using <tt>--dirstat=&lt;param1,param2,...&gt;</tt>). The fallback defaults
(when not changed by <tt>diff.dirstat</tt>) are <tt>changes,noncumulative,3</tt>.
The following parameters are available:
</p>
@@ -4166,13 +4166,13 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
and this config option ignored whenever the corresponding pack is
larger than 2 GB.
</p>
-<div class="paragraph"><p>If you have an old git that does not understand the version 2 <tt>&#42;.idx</tt> file,
+<div class="paragraph"><p>If you have an old git that does not understand the version 2 <tt>*.idx</tt> file,
cloning or fetching over a non native protocol (e.g. "http" and "rsync")
-that will copy both <tt>&#42;.pack</tt> file and corresponding <tt>&#42;.idx</tt> file from the
+that will copy both <tt>*.pack</tt> file and corresponding <tt>*.idx</tt> file from the
other side may give you a repository that cannot be accessed with your
-older version of git. If the <tt>&#42;.pack</tt> file is smaller than 2 GB, however,
+older version of git. If the <tt>*.pack</tt> file is smaller than 2 GB, however,
you can use <a href="git-index-pack.html">git-index-pack(1)</a> on the *.pack file to regenerate
-the <tt>&#42;.idx</tt> file.</p></div>
+the <tt>*.idx</tt> file.</p></div>
</dd>
<dt class="hdlist1">
pack.packSizeLimit
@@ -4210,9 +4210,9 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
Alias for a --pretty= format string, as specified in
<a href="git-log.html">git-log(1)</a>. Any aliases defined here can be used just
as the built-in pretty formats could. For example,
- running <tt>git config pretty.changelog "format:&#42; %H %s"</tt>
+ running <tt>git config pretty.changelog "format:* %H %s"</tt>
would cause the invocation <tt>git log --pretty=changelog</tt>
- to be equivalent to running <tt>git log "--pretty=format:&#42; %H %s"</tt>.
+ to be equivalent to running <tt>git log "--pretty=format:* %H %s"</tt>.
Note that an alias with the same name as a built-in format
will be silently ignored.
</p>
@@ -4266,24 +4266,42 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
</li>
<li>
<p>
-<tt>matching</tt> - push all matching branches.
- All branches having the same name in both ends are considered to be
- matching. This is the default.
+<tt>matching</tt> - push all branches having the same name in both ends.
+ This is for those who prepare all the branches into a publishable
+ shape and then push them out with a single command. It is not
+ appropriate for pushing into a repository shared by multiple users,
+ since locally stalled branches will attempt a non-fast forward push
+ if other users updated the branch.
+ <br />
+ This is currently the default, but Git 2.0 will change the default
+ to <tt>simple</tt>.
</p>
</li>
<li>
<p>
<tt>upstream</tt> - push the current branch to its upstream branch.
+ With this, <tt>git push</tt> will update the same remote ref as the one which
+ is merged by <tt>git pull</tt>, making <tt>push</tt> and <tt>pull</tt> symmetrical.
+ See "branch.&lt;name&gt;.merge" for how to configure the upstream branch.
</p>
</li>
<li>
<p>
-<tt>tracking</tt> - deprecated synonym for <tt>upstream</tt>.
+<tt>simple</tt> - like <tt>upstream</tt>, but refuses to push if the upstream
+ branch&#8217;s name is different from the local one. This is the safest
+ option and is well-suited for beginners. It will become the default
+ in Git 2.0.
</p>
</li>
<li>
<p>
<tt>current</tt> - push the current branch to a branch of the same name.
+ <br />
+ The <tt>simple</tt>, <tt>current</tt> and <tt>upstream</tt> modes are for those who want to
+ push out a single branch after finishing work, even when the other
+ branches are not yet ready to be pushed out. If you are working with
+ other people to push into the same shared repository, you would want
+ to use one of these.
</p>
</li>
</ul></div>
View
2 git-cvsserver.txt
@@ -252,7 +252,7 @@ Configuring database backend
'git-cvsserver' uses the Perl DBI module. Please also read
its documentation if changing these variables, especially
-about `DBI\->connect()`.
+about `DBI->connect()`.
gitcvs.dbname::
Database name. The exact meaning depends on the
View
6 git-diff-files.html
@@ -683,7 +683,7 @@ <h2 id="_options">OPTIONS</h2>
a stat graph) or by setting <tt>diff.statGraphWidth=&lt;width&gt;</tt>
(does not affect <tt>git format-patch</tt>).
By giving a third parameter <tt>&lt;count&gt;</tt>, you can limit the
- output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>&#8230;</tt> if
+ output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>...</tt> if
there are more.
</p>
<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=&lt;width&gt;</tt>,
@@ -891,7 +891,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
+ Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
@@ -1838,7 +1838,7 @@ <h2 id="_combined_diff_format">combined diff format</h2>
from both files (hence two <tt>-</tt> removals from both file1 and
file2, plus <tt>++</tt> to mean one line that was added does not appear
in either file1 nor file2). Also eight other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt>&#43;</tt>).</p></div>
+from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
parents). When shown by <tt>git diff-files -c</tt>, it compares the
View
6 git-diff-index.html
@@ -684,7 +684,7 @@ <h2 id="_options">OPTIONS</h2>
a stat graph) or by setting <tt>diff.statGraphWidth=&lt;width&gt;</tt>
(does not affect <tt>git format-patch</tt>).
By giving a third parameter <tt>&lt;count&gt;</tt>, you can limit the
- output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>&#8230;</tt> if
+ output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>...</tt> if
there are more.
</p>
<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=&lt;width&gt;</tt>,
@@ -892,7 +892,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
+ Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
@@ -1822,7 +1822,7 @@ <h2 id="_combined_diff_format">combined diff format</h2>
from both files (hence two <tt>-</tt> removals from both file1 and
file2, plus <tt>++</tt> to mean one line that was added does not appear
in either file1 nor file2). Also eight other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt>&#43;</tt>).</p></div>
+from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
parents). When shown by <tt>git diff-files -c</tt>, it compares the
View
10 git-diff-tree.html
@@ -685,7 +685,7 @@ <h2 id="_options">OPTIONS</h2>
a stat graph) or by setting <tt>diff.statGraphWidth=&lt;width&gt;</tt>
(does not affect <tt>git format-patch</tt>).
By giving a third parameter <tt>&lt;count&gt;</tt>, you can limit the
- output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>&#8230;</tt> if
+ output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>...</tt> if
there are more.
</p>
<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=&lt;width&gt;</tt>,
@@ -893,7 +893,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
+ Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
@@ -1377,7 +1377,7 @@ <h2 id="_options">OPTIONS</h2>
<p>
If provided, the results are limited to a subset of files
matching one of these prefix strings.
- i.e., file matches <tt>/^&lt;pattern1&gt;|&lt;pattern2&gt;|&#8230;/</tt>
+ i.e., file matches <tt>/^&lt;pattern1&gt;|&lt;pattern2&gt;|.../</tt>
Note that this parameter does not provide any wildcard or regexp
features.
</p>
@@ -2018,7 +2018,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
format if <tt>--decorate</tt> was not already provided on the command line.</td>
</tr></table>
</div>
-<div class="paragraph"><p>If you add a <tt>&#43;</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p></div>
<div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
@@ -2536,7 +2536,7 @@ <h2 id="_combined_diff_format">combined diff format</h2>
from both files (hence two <tt>-</tt> removals from both file1 and
file2, plus <tt>++</tt> to mean one line that was added does not appear
in either file1 nor file2). Also eight other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt>&#43;</tt>).</p></div>
+from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
parents). When shown by <tt>git diff-files -c</tt>, it compares the
View
6 git-diff.html
@@ -770,7 +770,7 @@ <h2 id="_options">OPTIONS</h2>
a stat graph) or by setting <tt>diff.statGraphWidth=&lt;width&gt;</tt>
(does not affect <tt>git format-patch</tt>).
By giving a third parameter <tt>&lt;count&gt;</tt>, you can limit the
- output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>&#8230;</tt> if
+ output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>...</tt> if
there are more.
</p>
<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=&lt;width&gt;</tt>,
@@ -981,7 +981,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
+ Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
@@ -1894,7 +1894,7 @@ <h2 id="_combined_diff_format">combined diff format</h2>
from both files (hence two <tt>-</tt> removals from both file1 and
file2, plus <tt>++</tt> to mean one line that was added does not appear
in either file1 nor file2). Also eight other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt>&#43;</tt>).</p></div>
+from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
parents). When shown by <tt>git diff-files -c</tt>, it compares the
View
4 git-fast-export.html
@@ -731,7 +731,7 @@ <h2 id="_options">OPTIONS</h2>
<p>
A list of arguments, acceptable to <em>git rev-parse</em> and
<em>git rev-list</em>, that specifies the specific objects and references
- to export. For example, <tt>master&#126;10..master</tt> causes the
+ to export. For example, <tt>master~10..master</tt> causes the
current master reference to be exported along with all objects
added since its 10th ancestor commit.
</p>
@@ -773,7 +773,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
2 git-fast-export.txt
@@ -104,7 +104,7 @@ marks the same across runs.
[<git-rev-list-args>...]::
A list of arguments, acceptable to 'git rev-parse' and
'git rev-list', that specifies the specific objects and references
- to export. For example, `master{tilde}10..master` causes the
+ to export. For example, `master~10..master` causes the
current master reference to be exported along with all objects
added since its 10th ancestor commit.
View
20 git-fast-import.html
@@ -881,9 +881,9 @@ <h3 id="_date_formats">Date Formats</h3><div style="clear:left"></div>
<div class="paragraph"><p>The time of the event is specified by <tt>&lt;time&gt;</tt> as the number of
seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is
written as an ASCII decimal integer.</p></div>
-<div class="paragraph"><p>The local offset is specified by <tt>&lt;offutc&gt;</tt> as a positive or negative
+<div class="paragraph"><p>The local offset is specified by &#8216;&lt;offutc&gt;` as a positive or negative
offset from UTC. For example EST (which is 5 hours behind UTC)
-would be expressed in <tt>&lt;tz&gt;</tt> by &#8220;-0500&#8221; while UTC is &#8220;+0000&#8221;.
+would be expressed in <tt>&lt;tz&gt;</tt> by <tt>`-0500'' while UTC is `</tt>+0000&#8217;'.
The local offset does not affect <tt>&lt;time&gt;</tt>; it is used only as an
advisement to help formatting routines display the timestamp.</p></div>
<div class="paragraph"><p>If the local offset is not available in the source material, use
@@ -1113,8 +1113,8 @@ <h4 id="_tt_committer_tt"><tt>committer</tt></h4>
<div class="paragraph"><p>The <tt>committer</tt> command indicates who made this commit, and when
they made it.</p></div>
<div class="paragraph"><p>Here <tt>&lt;name&gt;</tt> is the person&#8217;s display name (for example
-&#8220;Com M Itter&#8221;) and <tt>&lt;email&gt;</tt> is the person&#8217;s email address
-(&#8220;<a href="mailto:cm@example.com">cm@example.com</a>&#8221;). <tt>LT</tt> and <tt>GT</tt> are the literal less-than (\x3c)
+<tt>`Com M Itter'') and `&lt;email&gt;</tt> is the person&#8217;s email address
+(<tt>`cm@example.com''). `LT</tt> and <tt>GT</tt> are the literal less-than (\x3c)
and greater-than (\x3e) symbols. These are required to delimit
the email address from the other fields in the line. Note that
<tt>&lt;name&gt;</tt> and <tt>&lt;email&gt;</tt> are free-form and may contain any sequence
@@ -1176,9 +1176,9 @@ <h4 id="_tt_from_tt"><tt>from</tt></h4>
<div class="content">
<pre><tt> from refs/heads/branch^0</tt></pre>
</div></div>
-<div class="paragraph"><p>The <tt>&#94;0</tt> suffix is necessary as fast-import does not permit a branch to
+<div class="paragraph"><p>The <tt>^0</tt> suffix is necessary as fast-import does not permit a branch to
start from itself, and the branch is created in memory before the
-<tt>from</tt> command is even read from the input. Adding <tt>&#94;0</tt> will force
+<tt>from</tt> command is even read from the input. Adding <tt>^0</tt> will force
fast-import to resolve the commit through Git&#8217;s revision parsing library,
rather than its internal branch table, thereby loading in the
existing value of the branch.</p></div>
@@ -1686,7 +1686,7 @@ <h3 id="_tt_ls_tt"><tt>ls</tt></h3><div style="clear:left"></div>
</dd>
</dl></div>
<div class="paragraph"><p>See <tt>filemodify</tt> above for a detailed description of <tt>&lt;path&gt;</tt>.</p></div>
-<div class="paragraph"><p>Output uses the same format as <tt>git ls-tree &lt;tree&gt; &#45;&#45; &lt;path&gt;</tt>:</p></div>
+<div class="paragraph"><p>Output uses the same format as <tt>git ls-tree &lt;tree&gt; -- &lt;path&gt;</tt>:</p></div>
<div class="exampleblock">
<div class="exampleblock-content">
<div class="literalblock">
@@ -2009,8 +2009,8 @@ <h3 id="_use_tag_fixup_branches">Use Tag Fixup Branches</h3><div style="clear:le
files which are not from the same commit/changeset. Or to create
tags which are a subset of the files available in the repository.</p></div>
<div class="paragraph"><p>Importing these tags as-is in Git is impossible without making at
-least one commit which &#8220;fixes up&#8221; the files to match the content
-of the tag. Use fast-import&#8217;s <tt>reset</tt> command to reset a dummy branch
+least one commit which <tt>`fixes up'' the files to match the content
+of the tag. Use fast-import's `reset</tt> command to reset a dummy branch
outside of your normal branch space to the base commit for the tag,
then commit one or more file fixup commits, and finally tag the
dummy branch.</p></div>
@@ -2160,7 +2160,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-04-23 13:55:31 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
6 git-fast-import.txt
@@ -479,9 +479,9 @@ current branch value should be written as:
----
from refs/heads/branch^0
----
-The `{caret}0` suffix is necessary as fast-import does not permit a branch to
+The `^0` suffix is necessary as fast-import does not permit a branch to
start from itself, and the branch is created in memory before the
-`from` command is even read from the input. Adding `{caret}0` will force
+`from` command is even read from the input. Adding `^0` will force
fast-import to resolve the commit through Git's revision parsing library,
rather than its internal branch table, thereby loading in the
existing value of the branch.
@@ -979,7 +979,7 @@ Reading from a named tree::
See `filemodify` above for a detailed description of `<path>`.
-Output uses the same format as `git ls-tree <tree> {litdd} <path>`:
+Output uses the same format as `git ls-tree <tree> -- <path>`:
====
<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF
View
2 git-fetch.html
@@ -868,7 +868,7 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
The format of a &lt;refspec&gt; parameter is an optional plus
- <tt>&#43;</tt>, followed by the source ref &lt;src&gt;, followed
+ <tt>+</tt>, followed by the source ref &lt;src&gt;, followed
by a colon <tt>:</tt>, followed by the destination ref &lt;dst&gt;.
</p>
<div class="paragraph"><p>The remote ref that matches &lt;src&gt;
View
12 git-filter-branch.html
@@ -677,7 +677,7 @@ <h2 id="_options">OPTIONS</h2>
This is the filter for rewriting the index. It is similar to the
tree filter but does not check out the tree, which makes it much
faster. Frequently used with <tt>git rm --cached
- --ignore-unmatch &#8230;</tt>, see EXAMPLES below. For hairy
+ --ignore-unmatch ...</tt>, see EXAMPLES below. For hairy
cases, see <a href="git-update-index.html">git-update-index(1)</a>.
</p>
</dd>
@@ -980,14 +980,14 @@ <h2 id="_checklist_for_shrinking_a_repository">Checklist for Shrinking a Reposit
<li>
<p>
You really removed all variants of a filename, if a blob was moved
- over its lifetime. <tt>git log --name-only --follow --all --
- filename</tt> can help you find renames.
+ over its lifetime. <tt>git log --name-only --follow --all -- filename</tt>
+ can help you find renames.
</p>
</li>
<li>
<p>
-You really filtered all refs: use <tt>--tag-name-filter cat --
- --all</tt> when calling git-filter-branch.
+You really filtered all refs: use <tt>--tag-name-filter cat -- --all</tt>
+ when calling git-filter-branch.
</p>
</li>
</ul></div>
@@ -1036,7 +1036,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
34 git-filter-branch.txt
@@ -96,8 +96,8 @@ OPTIONS
--index-filter <command>::
This is the filter for rewriting the index. It is similar to the
tree filter but does not check out the tree, which makes it much
- faster. Frequently used with `git rm \--cached
- \--ignore-unmatch ...`, see EXAMPLES below. For hairy
+ faster. Frequently used with `git rm --cached
+ --ignore-unmatch ...`, see EXAMPLES below. For hairy
cases, see linkgit:git-update-index[1].
--parent-filter <command>::
@@ -222,11 +222,11 @@ However, if the file is absent from the tree of some commit,
a simple `rm filename` will fail for that tree and commit.
Thus you may instead want to use `rm -f filename` as the script.
-Using `\--index-filter` with 'git rm' yields a significantly faster
+Using `--index-filter` with 'git rm' yields a significantly faster
version. Like with using `rm filename`, `git rm --cached filename`
will fail if the file is absent from the tree of a commit. If you
want to "completely forget" a file, it does not matter when it entered
-history, so we also add `\--ignore-unmatch`:
+history, so we also add `--ignore-unmatch`:
--------------------------------------------------------------------------
git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD
@@ -242,8 +242,8 @@ git filter-branch --subdirectory-filter foodir -- --all
-------------------------------------------------------
Thus you can, e.g., turn a library subdirectory into a repository of
-its own. Note the `\--` that separates 'filter-branch' options from
-revision options, and the `\--all` to rewrite all branches and tags.
+its own. Note the `--` that separates 'filter-branch' options from
+revision options, and the `--all` to rewrite all branches and tags.
To set a commit (which typically is at the tip of another
history) to be the parent of the current initial commit, in
@@ -371,23 +371,23 @@ Checklist for Shrinking a Repository
------------------------------------
git-filter-branch is often used to get rid of a subset of files,
-usually with some combination of `\--index-filter` and
-`\--subdirectory-filter`. People expect the resulting repository to
+usually with some combination of `--index-filter` and
+`--subdirectory-filter`. People expect the resulting repository to
be smaller than the original, but you need a few more steps to
actually make it smaller, because git tries hard not to lose your
objects until you tell it to. First make sure that:
* You really removed all variants of a filename, if a blob was moved
- over its lifetime. `git log \--name-only \--follow \--all \--
- filename` can help you find renames.
+ over its lifetime. `git log --name-only --follow --all -- filename`
+ can help you find renames.
-* You really filtered all refs: use `\--tag-name-filter cat \--
- \--all` when calling git-filter-branch.
+* You really filtered all refs: use `--tag-name-filter cat -- --all`
+ when calling git-filter-branch.
Then there are two ways to get a smaller repository. A safer way is
to clone, that keeps your original intact.
-* Clone it with `git clone +++file:///path/to/repo+++`. The clone
+* Clone it with `git clone file:///path/to/repo`. The clone
will not have the removed objects. See linkgit:git-clone[1]. (Note
that cloning with a plain path just hardlinks everything!)
@@ -397,14 +397,14 @@ approach, so *make a backup* or go back to cloning it. You have been
warned.
* Remove the original refs backed up by git-filter-branch: say `git
- for-each-ref \--format="%(refname)" refs/original/ | xargs -n 1 git
+ for-each-ref --format="%(refname)" refs/original/ | xargs -n 1 git
update-ref -d`.
-* Expire all reflogs with `git reflog expire \--expire=now \--all`.
+* Expire all reflogs with `git reflog expire --expire=now --all`.
-* Garbage collect all unreferenced objects with `git gc \--prune=now`
+* Garbage collect all unreferenced objects with `git gc --prune=now`
(or if your git-gc is not new enough to support arguments to
- `\--prune`, use `git repack -ad; git prune` instead).
+ `--prune`, use `git repack -ad; git prune` instead).
GIT
---
View
4 git-format-patch.html
@@ -712,7 +712,7 @@ <h2 id="_options">OPTIONS</h2>
a stat graph) or by setting <tt>diff.statGraphWidth=&lt;width&gt;</tt>
(does not affect <tt>git format-patch</tt>).
By giving a third parameter <tt>&lt;count&gt;</tt>, you can limit the
- output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>&#8230;</tt> if
+ output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>...</tt> if
there are more.
</p>
<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=&lt;width&gt;</tt>,
@@ -1769,7 +1769,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
4 git-format-patch.txt
@@ -45,7 +45,7 @@ There are two ways to specify which commits to operate on.
The first rule takes precedence in the case of a single <commit>. To
apply the second rule, i.e., format everything since the beginning of
history up until <commit>, use the '\--root' option: `git format-patch
-\--root <commit>`. If you want to format only <commit> itself, you
+--root <commit>`. If you want to format only <commit> itself, you
can do this with `git format-patch -1 <commit>`.
By default, each output file is numbered sequentially from 1, and uses the
@@ -134,7 +134,7 @@ include::diff-options.txt[]
The optional <style> argument can be either `shallow` or `deep`.
'shallow' threading makes every mail a reply to the head of the
series, where the head is chosen from the cover letter, the
-`\--in-reply-to`, and the first patch mail, in this order. 'deep'
+`--in-reply-to`, and the first patch mail, in this order. 'deep'
threading makes every mail a reply to the previous one.
+
The default is `--no-thread`, unless the 'format.thread' configuration
View
2 git-gc.txt
@@ -84,7 +84,7 @@ The optional configuration variable 'gc.reflogExpireUnreachable'
can be set to indicate how long historical reflog entries which
are not part of the current branch should remain available in
this repository. These types of entries are generally created as
-a result of using `git commit \--amend` or `git rebase` and are the
+a result of using `git commit --amend` or `git rebase` and are the
commits prior to the amend or rebase occurring. Since these changes
are not part of the current project most users will want to expire
them sooner. This option defaults to '30 days'.
View
6 git-grep.html
@@ -1083,7 +1083,7 @@ <h2 id="_examples">Examples</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-<tt>git grep &#39;time_t&#39; -- &#39;*.[ch]&#39;</tt>
+<tt>git grep 'time_t' -- '*.[ch]'</tt>
</dt>
<dd>
<p>
@@ -1092,7 +1092,7 @@ <h2 id="_examples">Examples</h2>
</p>
</dd>
<dt class="hdlist1">
-<tt>git grep -e &#39;#define&#39; --and \( -e MAX_PATH -e PATH_MAX \)</tt>
+<tt>git grep -e '#define' --and \( -e MAX_PATH -e PATH_MAX \)</tt>
</dt>
<dd>
<p>
@@ -1119,7 +1119,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-03-31 11:18:40 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
4 git-grep.txt
@@ -247,11 +247,11 @@ OPTIONS
Examples
--------
-`git grep {apostrophe}time_t{apostrophe} \-- {apostrophe}*.[ch]{apostrophe}`::
+`git grep 'time_t' -- '*.[ch]'`::
Looks for `time_t` in all tracked .c and .h files in the working
directory and its subdirectories.
-`git grep -e {apostrophe}#define{apostrophe} --and \( -e MAX_PATH -e PATH_MAX \)`::
+`git grep -e '#define' --and \( -e MAX_PATH -e PATH_MAX \)`::
Looks for a line that has `#define` and either `MAX_PATH` or
`PATH_MAX`.
View
24 git-log.html
@@ -997,9 +997,9 @@ <h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div>
i.e. only those which would be marked <tt>&lt;</tt> resp. <tt>&gt;</tt> by
<tt>--left-right</tt>.
</p>
-<div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A&#8230;B</tt> omits those
+<div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A...B</tt> omits those
commits from <tt>B</tt> which are in <tt>A</tt> or are patch-equivalent to a commit in
-<tt>A</tt>. In other words, this lists the <tt>&#43;</tt> commits from <tt>git cherry A B</tt>.
+<tt>A</tt>. In other words, this lists the <tt>+</tt> commits from <tt>git cherry A B</tt>.
More precisely, <tt>--cherry-pick --right-only --no-merges</tt> gives the exact
list.</p></div>
</dd>
@@ -1011,7 +1011,7 @@ <h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div>
A synonym for <tt>--right-only --cherry-mark --no-merges</tt>; useful to
limit the output to the commits on our side and mark those that
have been applied to the other side of a forked history with
- <tt>git log --cherry upstream&#8230;mybranch</tt>, similar to
+ <tt>git log --cherry upstream...mybranch</tt>, similar to
<tt>git cherry upstream mybranch</tt>.
</p>
</dd>
@@ -1310,24 +1310,24 @@ <h3 id="_history_simplification">History Simplification</h3><div style="clear:le
First, build a history graph in the same way that
<em>--full-history</em> with parent rewriting does (see above).
</p>
-<div class="paragraph"><p>Then simplify each commit &#8216;C` to its replacement <tt>C&#8217;</tt> in the final
+<div class="paragraph"><p>Then simplify each commit <tt>C</tt> to its replacement <tt>C'</tt> in the final
history according to the following rules:</p></div>
<div class="ulist"><ul>
<li>
<p>
-Set &#8216;C&#8217;` to <tt>C</tt>.
+Set <tt>C'</tt> to <tt>C</tt>.
</p>
</li>
<li>
<p>
-Replace each parent &#8216;P` of <tt>C&#8217;</tt> with its simplification &#8216;P&#8217;`. In
+Replace each parent <tt>P</tt> of <tt>C'</tt> with its simplification <tt>P'</tt>. In
the process, drop parents that are ancestors of other parents, and
remove duplicates.
</p>
</li>
<li>
<p>
-If after this parent rewriting, &#8216;C&#8217;` is a root or merge commit (has
+If after this parent rewriting, <tt>C'</tt> is a root or merge commit (has
zero or &gt;1 parents), a boundary commit, or !TREESAME, it remains.
Otherwise, it is replaced with its only parent.
</p>
@@ -2163,7 +2163,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
format if <tt>--decorate</tt> was not already provided on the command line.</td>
</tr></table>
</div>
-<div class="paragraph"><p>If you add a <tt>&#43;</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p></div>
<div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
@@ -2296,7 +2296,7 @@ <h2 id="_common_diff_options">Common diff options</h2>
a stat graph) or by setting <tt>diff.statGraphWidth=&lt;width&gt;</tt>
(does not affect <tt>git format-patch</tt>).
By giving a third parameter <tt>&lt;count&gt;</tt>, you can limit the
- output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>&#8230;</tt> if
+ output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>...</tt> if
there are more.
</p>
<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=&lt;width&gt;</tt>,
@@ -2505,7 +2505,7 @@ <h2 id="_common_diff_options">Common diff options</h2>
</dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
+ Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
@@ -3160,7 +3160,7 @@ <h2 id="_combined_diff_format">combined diff format</h2>
from both files (hence two <tt>-</tt> removals from both file1 and
file2, plus <tt>++</tt> to mean one line that was added does not appear
in either file1 nor file2). Also eight other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt>&#43;</tt>).</p></div>
+from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
parents). When shown by <tt>git diff-files -c</tt>, it compares the
@@ -3406,7 +3406,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
2 git-log.txt
@@ -100,7 +100,7 @@ Examples
Show all commits since version 'v2.6.12' that changed any file
in the include/scsi or drivers/scsi subdirectories
-`git log --since="2 weeks ago" \-- gitk`::
+`git log --since="2 weeks ago" -- gitk`::
Show the changes during the last two weeks to the file 'gitk'.
The "--" is necessary to avoid confusion with the *branch* named
View
2 git-notes.txt
@@ -70,7 +70,7 @@ copy::
second object). This subcommand is equivalent to:
`git notes add [-f] -C $(git notes list <from-object>) <to-object>`
+
-In `\--stdin` mode, take lines in the format
+In `--stdin` mode, take lines in the format
+
----------
<from-object> SP <to-object> [ SP <rest> ] LF
View
2 git-pack-refs.txt
@@ -32,7 +32,7 @@ Subsequent updates to branches always create new files under
A recommended practice to deal with a repository with too many
refs is to pack its refs with `--all --prune` once, and
-occasionally run `git pack-refs \--prune`. Tags are by
+occasionally run `git pack-refs --prune`. Tags are by
definition stationary and are not expected to change. Branch
heads will be packed with the initial `pack-refs --all`, but
only the currently active branch heads will become unpacked,
View
6 git-pull.html
@@ -889,7 +889,7 @@ <h3 id="_options_related_to_merging">Options related to merging</h3><div style="
</p>
<div class="paragraph"><p>See <tt>pull.rebase</tt>, <tt>branch.&lt;name&gt;.rebase</tt> and <tt>branch.autosetuprebase</tt> in
<a href="git-config.html">git-config(1)</a> if you want to make <tt>git pull</tt> always use
-<tt>&#45;&#45;rebase</tt> instead of merging.</p></div>
+<tt>--rebase</tt> instead of merging.</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -1037,7 +1037,7 @@ <h3 id="_options_related_to_fetching">Options related to fetching</h3><div style
<dd>
<p>
The format of a &lt;refspec&gt; parameter is an optional plus
- <tt>&#43;</tt>, followed by the source ref &lt;src&gt;, followed
+ <tt>+</tt>, followed by the source ref &lt;src&gt;, followed
by a colon <tt>:</tt>, followed by the destination ref &lt;dst&gt;.
</p>
<div class="paragraph"><p>The remote ref that matches &lt;src&gt;
@@ -1639,7 +1639,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-12-09 15:40:58 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
2 git-pull.txt
@@ -110,7 +110,7 @@ include::merge-options.txt[]
+
See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
linkgit:git-config[1] if you want to make `git pull` always use
-`{litdd}rebase` instead of merging.
+`--rebase` instead of merging.
+
[NOTE]
This is a potentially _dangerous_ mode of operation.
View
14 git-push.html
@@ -617,7 +617,7 @@ <h2 id="_options_a_id_options_a">OPTIONS<a id="OPTIONS"></a></h2>
<dd>
<p>
The format of a &lt;refspec&gt; parameter is an optional plus
- <tt>&#43;</tt>, followed by the source ref &lt;src&gt;, followed
+ <tt>+</tt>, followed by the source ref &lt;src&gt;, followed
by a colon <tt>:</tt>, followed by the destination ref &lt;dst&gt;.
It is used to specify with what &lt;src&gt; object the &lt;dst&gt; ref
in the remote repository is to be updated.
@@ -631,14 +631,14 @@ <h2 id="_options_a_id_options_a">OPTIONS<a id="OPTIONS"></a></h2>
updated.</p></div>
<div class="paragraph"><p>The object referenced by &lt;src&gt; is used to update the &lt;dst&gt; reference
on the remote side, but by default this is only allowed if the
-update can fast-forward &lt;dst&gt;. By having the optional leading <tt>&#43;</tt>,
+update can fast-forward &lt;dst&gt;. By having the optional leading <tt>+</tt>,
you can tell git to update the &lt;dst&gt; ref even when the update is not a
fast-forward. This does <strong>not</strong> attempt to merge &lt;src&gt; into &lt;dst&gt;. See
EXAMPLES below for details.</p></div>
<div class="paragraph"><p><tt>tag &lt;tag&gt;</tt> means the same as <tt>refs/tags/&lt;tag&gt;:refs/tags/&lt;tag&gt;</tt>.</p></div>
<div class="paragraph"><p>Pushing an empty &lt;src&gt; allows you to delete the &lt;dst&gt; ref from
the remote repository.</p></div>
-<div class="paragraph"><p>The special refspec <tt>:</tt> (or <tt>&#43;:</tt> to allow non-fast-forward updates)
+<div class="paragraph"><p>The special refspec <tt>:</tt> (or <tt>+:</tt> to allow non-fast-forward updates)
directs git to push "matching" branches: for every branch that exists on
the local side, the remote side is updated if a branch of the same name
already exists on the remote side. This is the default operation mode
@@ -662,7 +662,7 @@ <h2 id="_options_a_id_options_a">OPTIONS<a id="OPTIONS"></a></h2>
Remove remote branches that don&#8217;t have a local counterpart. For example
a remote branch <tt>tmp</tt> will be removed if a local branch with the same
name doesn&#8217;t exist any more. This also respects refspecs, e.g.
- <tt>git push --prune remote refs/heads/&#42;:refs/tmp/&#42;</tt> would
+ <tt>git push --prune remote refs/heads/*:refs/tmp/*</tt> would
make sure that remote <tt>refs/tmp/foo</tt> will be removed if <tt>refs/heads/foo</tt>
doesn&#8217;t exist.
</p>
@@ -1100,7 +1100,7 @@ <h2 id="_output">OUTPUT</h2>
</p>
</dd>
<dt class="hdlist1">
-<tt>&#43;</tt>
+<tt>+</tt>
</dt>
<dd>
<p>
@@ -1387,7 +1387,7 @@ <h2 id="_examples">Examples</h2>
</p>
</dd>
<dt class="hdlist1">
-<tt>git push origin &#43;dev:master</tt>
+<tt>git push origin +dev:master</tt>
</dt>
<dd>
<p>
@@ -1423,7 +1423,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-04-24 15:16:09 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>
View
14 git-push.txt
@@ -34,7 +34,7 @@ OPTIONS[[OPTIONS]]
<refspec>...::
The format of a <refspec> parameter is an optional plus
- `{plus}`, followed by the source ref <src>, followed
+ `+`, followed by the source ref <src>, followed
by a colon `:`, followed by the destination ref <dst>.
It is used to specify with what <src> object the <dst> ref
in the remote repository is to be updated.
@@ -50,7 +50,7 @@ updated.
+
The object referenced by <src> is used to update the <dst> reference
on the remote side, but by default this is only allowed if the
-update can fast-forward <dst>. By having the optional leading `{plus}`,
+update can fast-forward <dst>. By having the optional leading `+`,
you can tell git to update the <dst> ref even when the update is not a
fast-forward. This does *not* attempt to merge <src> into <dst>. See
EXAMPLES below for details.
@@ -60,7 +60,7 @@ EXAMPLES below for details.
Pushing an empty <src> allows you to delete the <dst> ref from
the remote repository.
+
-The special refspec `:` (or `{plus}:` to allow non-fast-forward updates)
+The special refspec `:` (or `+:` to allow non-fast-forward updates)
directs git to push "matching" branches: for every branch that exists on
the local side, the remote side is updated if a branch of the same name
already exists on the remote side. This is the default operation mode
@@ -75,7 +75,7 @@ nor in any Push line of the corresponding remotes file---see below).
Remove remote branches that don't have a local counterpart. For example
a remote branch `tmp` will be removed if a local branch with the same
name doesn't exist any more. This also respects refspecs, e.g.
- `git push --prune remote refs/heads/{asterisk}:refs/tmp/{asterisk}` would
+ `git push --prune remote refs/heads/*:refs/tmp/*` would
make sure that remote `refs/tmp/foo` will be removed if `refs/heads/foo`
doesn't exist.
@@ -210,7 +210,7 @@ option is used.
flag::
A single character indicating the status of the ref:
(space);; for a successfully pushed fast-forward;
-`{plus}`;; for a successful forced update;
+`+`;; for a successful forced update;
`-`;; for a successfully deleted ref;
`*`;; for a successfully pushed new ref;
`!`;; for a ref that was rejected or failed to push; and
@@ -220,7 +220,7 @@ summary::
For a successfully pushed ref, the summary shows the old and new
values of the ref in a form suitable for using as an argument to
`git log` (this is `<old>..<new>` in most cases, and
- `<old>\...<new>` for forced non-fast-forward updates).
+ `<old>...<new>` for forced non-fast-forward updates).
+
For a failed update, more details are given:
+
@@ -402,7 +402,7 @@ the ones in the examples below) can be configured as the default for
Find a ref that matches `experimental` in the `origin` repository
(e.g. `refs/heads/experimental`), and delete it.
-`git push origin {plus}dev:master`::
+`git push origin +dev:master`::
Update the origin repository's master branch with the dev branch,
allowing non-fast-forward updates. *This can leave unreferenced
commits dangling in the origin repository.* Consider the
View
10 git-rebase.txt
@@ -271,7 +271,7 @@ which makes little sense.
-X <strategy-option>::
--strategy-option=<strategy-option>::
Pass the <strategy-option> through to the merge strategy.
- This implies `\--merge` and, if no strategy has been
+ This implies `--merge` and, if no strategy has been
specified, `-s recursive`. Note the reversal of 'ours' and
'theirs' as noted in above for the `-m` option.