Skip to content
Browse files

Autogenerated HTML docs for v1.5.6.1-156-ge903b

  • Loading branch information...
1 parent bb8e996 commit fce7c7e1549d1a2a2b0faf5952378236eed4d468 Junio C Hamano committed Jul 2, 2008
Showing with 2,214 additions and 2,023 deletions.
  1. +31 −0 RelNotes-1.5.6.2.txt
  2. +25 −4 RelNotes-1.6.0.txt
  3. +17 −5 config.txt
  4. +1 −1 diff-options.txt
  5. +1 −1 everyday.html
  6. +3 −3 git-add.html
  7. +2 −2 git-add.txt
  8. +3 −3 git-am.html
  9. +2 −2 git-am.txt
  10. +2 −2 git-annotate.html
  11. +1 −1 git-annotate.txt
  12. +20 −10 git-apply.html
  13. +13 −8 git-apply.txt
  14. +5 −5 git-archimport.html
  15. +4 −4 git-archimport.txt
  16. +5 −5 git-archive.html
  17. +4 −4 git-archive.txt
  18. +5 −5 git-bisect.html
  19. +4 −4 git-bisect.txt
  20. +4 −4 git-blame.html
  21. +3 −3 git-blame.txt
  22. +9 −9 git-branch.html
  23. +8 −8 git-branch.txt
  24. +21 −22 git-bundle.html
  25. +20 −21 git-bundle.txt
  26. +3 −3 git-cat-file.html
  27. +2 −2 git-cat-file.txt
  28. +2 −2 git-check-attr.html
  29. +1 −1 git-check-attr.txt
  30. +3 −3 git-check-ref-format.html
  31. +2 −2 git-check-ref-format.txt
  32. +12 −12 git-checkout-index.html
  33. +11 −11 git-checkout-index.txt
  34. +7 −7 git-checkout.html
  35. +6 −6 git-checkout.txt
  36. +3 −3 git-cherry-pick.html
  37. +2 −2 git-cherry-pick.txt
  38. +6 −6 git-cherry.html
  39. +5 −5 git-cherry.txt
  40. +3 −3 git-citool.html
  41. +2 −2 git-citool.txt
  42. +4 −4 git-clean.html
  43. +3 −3 git-clean.txt
  44. +8 −8 git-clone.html
  45. +7 −7 git-clone.txt
  46. +3 −3 git-commit-tree.html
  47. +2 −2 git-commit-tree.txt
  48. +15 −15 git-commit.html
  49. +14 −14 git-commit.txt
  50. +36 −25 git-config.html
  51. +19 −19 git-config.txt
  52. +3 −3 git-count-objects.html
  53. +2 −2 git-count-objects.txt
  54. +8 −7 git-cvsexportcommit.html
  55. +7 −6 git-cvsexportcommit.txt
  56. +11 −11 git-cvsimport.html
  57. +10 −10 git-cvsimport.txt
  58. +23 −23 git-cvsserver.html
  59. +22 −23 git-cvsserver.txt
  60. +13 −13 git-daemon.html
  61. +17 −17 git-daemon.txt
  62. +8 −8 git-describe.html
  63. +7 −7 git-describe.txt
  64. +4 −4 git-diff-files.html
  65. +2 −2 git-diff-files.txt
  66. +19 −19 git-diff-index.html
  67. +17 −17 git-diff-index.txt
  68. +11 −11 git-diff-tree.html
  69. +9 −9 git-diff-tree.txt
  70. +11 −11 git-diff.html
  71. +9 −9 git-diff.txt
  72. +6 −6 git-fast-export.html
  73. +5 −5 git-fast-export.txt
  74. +13 −13 git-fast-import.html
  75. +12 −12 git-fast-import.txt
  76. +10 −10 git-fetch-pack.html
  77. +9 −9 git-fetch-pack.txt
  78. +3 −3 git-fetch.html
  79. +2 −2 git-fetch.txt
  80. +8 −8 git-filter-branch.html
  81. +7 −7 git-filter-branch.txt
  82. +3 −3 git-fmt-merge-msg.html
  83. +2 −2 git-fmt-merge-msg.txt
  84. +5 −5 git-for-each-ref.html
  85. +4 −4 git-for-each-ref.txt
  86. +5 −5 git-format-patch.html
  87. +3 −3 git-format-patch.txt
  88. +2 −2 git-fsck-objects.html
  89. +1 −1 git-fsck-objects.txt
  90. +6 −6 git-fsck.html
  91. +5 −5 git-fsck.txt
  92. +9 −9 git-gc.html
  93. +8 −8 git-gc.txt
  94. +5 −5 git-get-tar-commit-id.html
  95. +4 −4 git-get-tar-commit-id.txt
  96. +3 −3 git-grep.html
  97. +2 −2 git-grep.txt
  98. +13 −13 git-gui.html
  99. +12 −12 git-gui.txt
  100. +3 −3 git-hash-object.html
  101. +2 −2 git-hash-object.txt
  102. +4 −4 git-help.html
  103. +3 −3 git-help.txt
  104. +3 −3 git-http-fetch.html
  105. +2 −2 git-http-fetch.txt
  106. +2 −2 git-http-push.html
  107. +1 −1 git-http-push.txt
  108. +4 −4 git-imap-send.html
  109. +3 −3 git-imap-send.txt
  110. +7 −7 git-index-pack.html
  111. +6 −6 git-index-pack.txt
  112. +2 −2 git-init-db.html
  113. +1 −1 git-init-db.txt
  114. +4 −4 git-init.html
  115. +3 −3 git-init.txt
  116. +5 −5 git-instaweb.html
  117. +4 −4 git-instaweb.txt
  118. +5 −5 git-log.html
  119. +3 −3 git-log.txt
  120. +2 −2 git-lost-found.html
  121. +1 −1 git-lost-found.txt
  122. +6 −6 git-ls-files.html
  123. +5 −5 git-ls-files.txt
  124. +3 −3 git-ls-remote.html
  125. +2 −2 git-ls-remote.txt
  126. +2 −2 git-ls-tree.html
  127. +1 −1 git-ls-tree.txt
  128. +5 −5 git-mailinfo.html
  129. +4 −4 git-mailinfo.txt
  130. +2 −2 git-mailsplit.html
  131. +1 −1 git-mailsplit.txt
  132. +6 −6 git-merge-base.html
  133. +5 −5 git-merge-base.txt
  134. +8 −8 git-merge-file.html
  135. +7 −7 git-merge-file.txt
  136. +11 −11 git-merge-index.html
  137. +10 −10 git-merge-index.txt
  138. +3 −3 git-merge-one-file.html
  139. +2 −2 git-merge-one-file.txt
  140. +2 −2 git-merge-tree.html
  141. +1 −1 git-merge-tree.txt
  142. +14 −11 git-merge.html
  143. +13 −11 git-merge.txt
  144. +10 −10 git-mergetool.html
  145. +9 −9 git-mergetool.txt
  146. +2 −2 git-mktag.html
  147. +1 −1 git-mktag.txt
  148. +2 −2 git-mktree.html
  149. +1 −1 git-mktree.txt
  150. +4 −4 git-mv.html
  151. +3 −3 git-mv.txt
  152. +5 −5 git-name-rev.html
  153. +4 −4 git-name-rev.txt
  154. +5 −5 git-pack-objects.html
  155. +5 −5 git-pack-objects.txt
  156. +5 −5 git-pack-redundant.html
  157. +5 −5 git-pack-redundant.txt
  158. +3 −3 git-pack-refs.html
  159. +2 −2 git-pack-refs.txt
  160. +1 −1 git-parse-remote.html
  161. +3 −3 git-patch-id.html
  162. +2 −2 git-patch-id.txt
  163. +4 −4 git-peek-remote.html
  164. +3 −3 git-peek-remote.txt
  165. +2 −2 git-prune-packed.html
  166. +1 −1 git-prune-packed.txt
  167. +8 −8 git-prune.html
  168. +7 −7 git-prune.txt
  169. +3 −4 git-pull.html
  170. +2 −3 git-pull.txt
  171. +3 −3 git-push.html
  172. +2 −2 git-push.txt
  173. +2 −2 git-quiltimport.html
  174. +1 −1 git-quiltimport.txt
  175. +24 −24 git-read-tree.html
  176. +23 −23 git-read-tree.txt
  177. +20 −20 git-rebase.html
  178. +19 −19 git-rebase.txt
  179. +13 −13 git-receive-pack.html
  180. +12 −12 git-receive-pack.txt
  181. +1 −1 git-reflog.html
  182. +2 −2 git-relink.html
  183. +1 −1 git-relink.txt
  184. +7 −7 git-remote.html
  185. +6 −6 git-remote.txt
  186. +9 −8 git-repack.html
  187. +8 −7 git-repack.txt
  188. +2 −2 git-repo-config.html
  189. +1 −1 git-repo-config.txt
  190. +2 −2 git-request-pull.html
  191. +1 −1 git-request-pull.txt
  192. +8 −8 git-rerere.html
  193. +7 −7 git-rerere.txt
  194. +2 −2 git-reset.html
  195. +1 −1 git-reset.txt
  196. +9 −9 git-rev-list.html
  197. +8 −8 git-rev-list.txt
  198. +10 −10 git-rev-parse.html
  199. +9 −9 git-rev-parse.txt
  200. +2 −2 git-revert.html
  201. +1 −1 git-revert.txt
  202. +6 −6 git-rm.html
  203. +5 −5 git-rm.txt
  204. +24 −6 git-send-email.html
  205. +13 −5 git-send-email.txt
  206. +9 −9 git-send-pack.html
  207. +8 −8 git-send-pack.txt
  208. +1 −1 git-sh-setup.html
  209. +2 −2 git-shell.html
  210. +1 −1 git-shell.txt
  211. +4 −4 git-shortlog.html
  212. +3 −3 git-shortlog.txt
  213. +5 −5 git-show-branch.html
  214. +4 −4 git-show-branch.txt
  215. +4 −4 git-show-index.html
  216. +3 −3 git-show-index.txt
  217. +6 −6 git-show-ref.html
  218. +5 −5 git-show-ref.txt
  219. +5 −5 git-show.html
  220. +4 −4 git-show.txt
  221. +12 −12 git-stash.html
  222. +11 −11 git-stash.txt
  223. +4 −4 git-status.html
  224. +3 −3 git-status.txt
  225. +2 −2 git-stripspace.html
  226. +1 −1 git-stripspace.txt
  227. +8 −8 git-submodule.html
  228. +7 −7 git-submodule.txt
  229. +78 −79 git-svn.html
  230. +76 −77 git-svn.txt
  231. +3 −3 git-symbolic-ref.html
  232. +2 −2 git-symbolic-ref.txt
  233. +10 −10 git-tag.html
  234. +9 −9 git-tag.txt
  235. +4 −4 git-tar-tree.html
  236. +3 −3 git-tar-tree.txt
  237. +1 −1 git-tools.html
  238. +2 −2 git-unpack-file.html
  239. +1 −1 git-unpack-file.txt
  240. +3 −3 git-unpack-objects.html
  241. +2 −2 git-unpack-objects.txt
  242. +14 −14 git-update-index.html
  243. +13 −13 git-update-index.txt
  244. +6 −6 git-update-ref.html
  245. +5 −5 git-update-ref.txt
  246. +3 −3 git-update-server-info.html
  247. +2 −2 git-update-server-info.txt
  248. +3 −3 git-upload-archive.html
  249. +2 −2 git-upload-archive.txt
  250. +5 −5 git-upload-pack.html
  251. +4 −4 git-upload-pack.txt
  252. +3 −3 git-var.html
  253. +2 −2 git-var.txt
  254. +4 −4 git-verify-pack.html
  255. +3 −3 git-verify-pack.txt
  256. +3 −3 git-verify-tag.html
  257. +2 −2 git-verify-tag.txt
  258. +6 −6 git-web--browse.html
  259. +5 −5 git-web--browse.txt
  260. +6 −6 git-whatchanged.html
  261. +5 −5 git-whatchanged.txt
  262. +2 −2 git-write-tree.html
  263. +1 −1 git-write-tree.txt
  264. +16 −16 git.html
  265. +15 −15 git.txt
  266. +10 −10 gitattributes.html
  267. +9 −9 gitattributes.txt
  268. +43 −2 gitcli.html
  269. +37 −1 gitcli.txt
  270. +64 −65 gitcore-tutorial.html
  271. +63 −64 gitcore-tutorial.txt
  272. +13 −13 gitcvs-migration.html
  273. +12 −12 gitcvs-migration.txt
  274. +18 −18 gitdiffcore.html
  275. +17 −17 gitdiffcore.txt
  276. +1 −1 gitglossary.html
  277. +6 −6 githooks.html
  278. +5 −5 githooks.txt
  279. +5 −5 gitignore.html
  280. +4 −4 gitignore.txt
  281. +3 −2 gitk.html
  282. +2 −1 gitk.txt
  283. +1 −1 gitmodules.html
  284. +13 −13 gitrepository-layout.html
  285. +12 −12 gitrepository-layout.txt
  286. +20 −22 gittutorial-2.html
  287. +19 −21 gittutorial-2.txt
  288. +34 −34 gittutorial.html
  289. +33 −33 gittutorial.txt
  290. +1 −1 howto-index.html
  291. +1 −1 howto/revert-branch-rebase.html
  292. +1 −1 howto/using-merge-subtree.html
  293. +1 −1 technical/api-allocation-growing.html
  294. +1 −1 technical/api-builtin.html
  295. +1 −1 technical/api-decorate.html
  296. +1 −1 technical/api-diff.html
  297. +1 −1 technical/api-directory-listing.html
  298. +1 −1 technical/api-gitattributes.html
  299. +1 −1 technical/api-grep.html
  300. +1 −1 technical/api-hash.html
Sorry, we could not display the entire diff because too many files (317) changed.
View
31 RelNotes-1.5.6.2.txt
@@ -0,0 +1,31 @@
+GIT v1.5.6.2 Release Notes
+==========================
+
+Futureproof
+-----------
+
+ * "git-shell" accepts requests without a dash between "git" and
+ subcommand name (e.g. "git upload-pack") which the newer client will
+ start to make sometime in the future.
+
+Fixes since v1.5.6.1
+--------------------
+
+* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
+ serious memory and temporary file leak, which made it unusable for
+ moderately large import.
+
+* "git-svn" mangled remote nickname used in the configuration file
+ unnecessarily.
+
+* "git diff --check" did not report the result via its exit status
+ reliably.
+
+* "git show" segfaulted when an annotated tag that points at another
+ annotated tag was given to it.
+
+--
+exec >/var/tmp/1
+echo O=$(git describe maint)
+O=v1.5.6.1-13-g4f3dcc2
+git shortlog --no-merges $O..maint
View
29 RelNotes-1.6.0.txt
@@ -4,9 +4,6 @@ GIT v1.6.0 Release Notes
User visible changes
--------------------
-[[Note that none of these are not merged to 'master' as of this writing
-but they will be before 1.6.0 happens]]
-
With the default Makefile settings, most of the programs are now
installed outside your $PATH, except for "git", "gitk", "git-gui" and
some server side programs that need to be accessible for technical
@@ -21,6 +18,11 @@ scripts to use "git xyzzy" form, as we will stop installing
Source changes needed for porting to MinGW environment are now all in the
main git.git codebase.
+By default, packfiles created with this version uses delta-base-offset
+encoding introduced in v1.4.4. Pack idx files are using version 2 that
+allows larger packs and added robustness thanks to its CRC checking,
+introduced in v1.5.2.
+
Updates since v1.5.6
--------------------
@@ -77,14 +79,33 @@ Updates since v1.5.6
(usability, bells and whistles)
+* git-apply can handle a patch that touches the same path more than once
+ much better than before.
+
+* git-apply can be told not to trust the line counts recorded in the input
+ patch but recount, with the new --recount option.
+
* git-archive can be told to omit certain paths from its output using
export-ignore attributes.
+* git-clone can clone from a remote whose URL would be rewritten by
+ configuration stored in $HOME/.gitconfig now.
+
+* git-diff --check now checks leftover merge conflict markers.
+
+* When remote side used to have branch 'foo' and git-fetch finds that now
+ it has branch 'foo/bar', it refuses to lose the existing remote tracking
+ branch and its reflog. The error message has been improved to suggest
+ pruning the remote if the user wants to proceed and get the latest set
+ of branches from the remote, including such 'foo/bar'.
+
* fast-export learned to export and import marks file; this can be used to
interface with fast-import incrementally.
* Original SHA-1 value for "update-ref -d" is optional now.
+* git-send-mail can talk not just over SSL but over TLS now.
+
* You can tell "git status -u" to even more aggressively omit checking
untracked files with --untracked-files=no.
@@ -108,6 +129,6 @@ this release, unless otherwise noted.
---
exec >/var/tmp/1
-O=v1.5.6.1-104-ga08b868
+O=v1.5.6.1-155-gaa0c1f2
echo O=$(git describe refs/heads/master)
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
View
22 config.txt
@@ -945,9 +945,17 @@ pack.indexVersion::
legacy pack index used by Git versions prior to 1.5.2, and 2 for
the new pack index with capabilities for packs larger than 4 GB
as well as proper protection against the repacking of corrupted
- packs. Version 2 is selected and this config option ignored
- whenever the corresponding pack is larger than 2 GB. Otherwise
- the default is 1.
+ packs. Version 2 is the default. Note that version 2 is enforced
+ 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,
+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
+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,
+you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
+the `{asterisk}.idx` file.
pack.packSizeLimit::
The default maximum size of a pack. This setting only affects
@@ -1004,8 +1012,12 @@ remotes.<group>::
<group>". See linkgit:git-remote[1].
repack.usedeltabaseoffset::
- Allow linkgit:git-repack[1] to create packs that uses
- delta-base offset. Defaults to false.
+ By default, linkgit:git-repack[1] creates packs that use
+ delta-base offset. If you need to share your repository with
+ git older than version 1.4.4, either directly or via a dumb
+ protocol such as http, then you need to set this option to
+ "false" and repack. Access from old git versions over the
+ native protocol are unaffected by this option.
showbranch.default::
The default set of branches for linkgit:git-show-branch[1].
View
2 diff-options.txt
@@ -241,4 +241,4 @@ endif::git-format-patch[]
Do not show any source or destination prefix.
For more detailed explanation on these common options, see also
-linkgit:gitdiffcore[7][diffcore documentation].
+linkgit:gitdiffcore[7].
View
2 everyday.html
@@ -1050,7 +1050,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:34:35 UTC
+Last updated 02-Jul-2008 03:02:14 UTC
</div>
</div>
</body>
View
6 git-add.html
@@ -273,7 +273,7 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-add</em> [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
+<div class="content"><em>git add</em> [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
[--update | -u] [--refresh] [--ignore-errors] [--]
&lt;filepattern&gt;&#8230;</div></div>
</div>
@@ -429,7 +429,7 @@
<p>The optional configuration variable <em>core.excludesfile</em> indicates a path to a
file containing patterns of file names to exclude from git-add, similar to
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
-those in info/exclude. See <a href="gitrepository-layout.html">gitrepository-layout(5)</a>[repository layout].</p>
+those in info/exclude. See <a href="gitrepository-layout.html">gitrepository-layout(5)</a>.</p>
</div>
<h2>EXAMPLES</h2>
<div class="sectionbody">
@@ -623,7 +623,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 15-Jun-2008 05:10:05 UTC
+Last updated 02-Jul-2008 03:01:31 UTC
</div>
</div>
</body>
View
4 git-add.txt
@@ -8,7 +8,7 @@ git-add - Add file contents to the index
SYNOPSIS
--------
[verse]
-'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
+'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
[--update | -u] [--refresh] [--ignore-errors] [--]
<filepattern>...
@@ -107,7 +107,7 @@ Configuration
The optional configuration variable 'core.excludesfile' indicates a path to a
file containing patterns of file names to exclude from git-add, similar to
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
-those in info/exclude. See linkgit:gitrepository-layout[5][repository layout].
+those in info/exclude. See linkgit:gitrepository-layout[5].
EXAMPLES
View
6 git-am.html
@@ -273,11 +273,11 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-am</em> [--signoff] [--keep] [--utf8 | --no-utf8]
+<div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--binary]
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;]
&lt;mbox&gt;|&lt;Maildir&gt;&#8230;
-<em>git-am</em> [--skip | --resolved]</div></div>
+<em>git am</em> [--skip | --resolved]</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -524,7 +524,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:16 UTC
+Last updated 02-Jul-2008 03:01:31 UTC
</div>
</div>
</body>
View
4 git-am.txt
@@ -9,11 +9,11 @@ git-am - Apply a series of patches from a mailbox
SYNOPSIS
--------
[verse]
-'git-am' [--signoff] [--keep] [--utf8 | --no-utf8]
+'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--binary]
[--whitespace=<option>] [-C<n>] [-p<n>]
<mbox>|<Maildir>...
-'git-am' [--skip | --resolved]
+'git am' [--skip | --resolved]
DESCRIPTION
-----------
View
4 git-annotate.html
@@ -272,7 +272,7 @@
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p>git-annotate [options] file [revision]</p>
+<p><em>git annotate</em> [options] file [revision]</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -460,7 +460,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:17 UTC
+Last updated 02-Jul-2008 03:01:32 UTC
</div>
</div>
</body>
View
2 git-annotate.txt
@@ -7,7 +7,7 @@ git-annotate - Annotate file lines with commit info
SYNOPSIS
--------
-git-annotate [options] file [revision]
+'git annotate' [options] file [revision]
DESCRIPTION
-----------
View
30 git-apply.html
@@ -273,10 +273,10 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index]
+<div class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index]
[--apply] [--no-add] [--build-fake-ancestor &lt;file&gt;] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
- [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]
+ [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
[--whitespace=&lt;nowarn|warn|fix|error|error-all&gt;]
[--exclude=PATH] [--verbose] [&lt;patch&gt;&#8230;]</div></div>
</div>
@@ -368,7 +368,7 @@
</dt>
<dd>
<p>
- Newer git-diff output has embedded <em>index information</em>
+ Newer <tt>git-diff</tt> output has embedded <em>index information</em>
for each blob to help identify the original version that
the patch applies to. When this flag is given, and if
the original versions of the blobs is available locally,
@@ -393,7 +393,7 @@
</dt>
<dd>
<p>
- For atomicity, <a href="git-apply.html">git-apply(1)</a> by default fails the whole patch and
+ For atomicity, <tt>git-apply</tt> by default fails the whole patch and
does not touch the working tree when some of the hunks
do not apply. This option makes it apply
the parts of the patch that are applicable, and leave the
@@ -437,7 +437,7 @@
</dt>
<dd>
<p>
- By default, <a href="git-apply.html">git-apply(1)</a> expects that the patch being
+ By default, <tt>git-apply</tt> expects that the patch being
applied is a unified diff with at least one line of context.
This provides good safety measures, but breaks down when
applying a diff generated with --unified=0. To bypass these
@@ -452,7 +452,7 @@
<dd>
<p>
If you use any of the options marked "Turns off
- <em>apply</em>" above, <a href="git-apply.html">git-apply(1)</a> reads and outputs the
+ <em>apply</em>" above, <tt>git-apply</tt> reads and outputs the
information you asked without actually applying the
patch. Give this flag after those flags to also apply
the patch.
@@ -508,8 +508,8 @@
considered whitespace errors.
</p>
<p>By default, the command outputs warning messages but applies the patch.
-When <a href="git-apply.html">git-apply(1)</a> is used for statistics and not applying a
-patch, it defaults to <tt>nowarn</tt>.</p>
+When <tt>git-apply is used for statistics and not applying a
+patch, it defaults to `nowarn</tt>.</p>
<p>You can use different <tt>&lt;action&gt;</tt> to control this
behavior:</p>
<ul>
@@ -570,6 +570,16 @@
additional information to be reported.
</p>
</dd>
+<dt>
+--recount
+</dt>
+<dd>
+<p>
+ Do not trust the line counts in the hunk headers, but infer them
+ by inspecting the patch (e.g. after editing the patch without
+ adjusting the hunk headers appropriately).
+</p>
+</dd>
</dl>
</div>
<h2>Configuration</h2>
@@ -588,7 +598,7 @@
</div>
<h2>Submodules</h2>
<div class="sectionbody">
-<p>If the patch contains any changes to submodules then <a href="git-apply.html">git-apply(1)</a>
+<p>If the patch contains any changes to submodules then <tt>git-apply</tt>
treats these changes as follows.</p>
<p>If --index is specified (explicitly or implicitly), then the submodule
commits must match the index exactly for the patch to apply. If any
@@ -613,7 +623,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:18 UTC
+Last updated 02-Jul-2008 03:01:32 UTC
</div>
</div>
</body>
View
21 git-apply.txt
@@ -9,10 +9,10 @@ git-apply - Apply a patch on a git index file and a working tree
SYNOPSIS
--------
[verse]
-'git-apply' [--stat] [--numstat] [--summary] [--check] [--index]
+'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
[--apply] [--no-add] [--build-fake-ancestor <file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
- [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]
+ [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
[--whitespace=<nowarn|warn|fix|error|error-all>]
[--exclude=PATH] [--verbose] [<patch>...]
@@ -64,7 +64,7 @@ OPTIONS
without using the working tree. This implies '--index'.
--build-fake-ancestor <file>::
- Newer git-diff output has embedded 'index information'
+ Newer `git-diff` output has embedded 'index information'
for each blob to help identify the original version that
the patch applies to. When this flag is given, and if
the original versions of the blobs is available locally,
@@ -78,7 +78,7 @@ the information is read from the current index instead.
Apply the patch in reverse.
--reject::
- For atomicity, linkgit:git-apply[1] by default fails the whole patch and
+ For atomicity, `git-apply` by default fails the whole patch and
does not touch the working tree when some of the hunks
do not apply. This option makes it apply
the parts of the patch that are applicable, and leave the
@@ -102,7 +102,7 @@ the information is read from the current index instead.
ever ignored.
--unidiff-zero::
- By default, linkgit:git-apply[1] expects that the patch being
+ By default, `git-apply` expects that the patch being
applied is a unified diff with at least one line of context.
This provides good safety measures, but breaks down when
applying a diff generated with --unified=0. To bypass these
@@ -113,7 +113,7 @@ discouraged.
--apply::
If you use any of the options marked "Turns off
- 'apply'" above, linkgit:git-apply[1] reads and outputs the
+ 'apply'" above, `git-apply` reads and outputs the
information you asked without actually applying the
patch. Give this flag after those flags to also apply
the patch.
@@ -147,7 +147,7 @@ discouraged.
considered whitespace errors.
+
By default, the command outputs warning messages but applies the patch.
-When linkgit:git-apply[1] is used for statistics and not applying a
+When `git-apply is used for statistics and not applying a
patch, it defaults to `nowarn`.
+
You can use different `<action>` to control this
@@ -177,6 +177,11 @@ behavior:
current patch being applied will be printed. This option will cause
additional information to be reported.
+--recount::
+ Do not trust the line counts in the hunk headers, but infer them
+ by inspecting the patch (e.g. after editing the patch without
+ adjusting the hunk headers appropriately).
+
Configuration
-------------
@@ -186,7 +191,7 @@ apply.whitespace::
Submodules
----------
-If the patch contains any changes to submodules then linkgit:git-apply[1]
+If the patch contains any changes to submodules then `git-apply`
treats these changes as follows.
If --index is specified (explicitly or implicitly), then the submodule
View
10 git-archimport.html
@@ -273,7 +273,7 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
+<div class="content"><em>git archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
&lt;archive/branch&gt;[:&lt;git-branch&gt;] &#8230;</div></div>
</div>
<h2>DESCRIPTION</h2>
@@ -294,11 +294,11 @@
Arch repository.
Make sure you have a recent version of <tt>tla</tt> available in the path. <tt>tla</tt> must
know about the repositories you pass to <tt>git-archimport</tt>.</p>
-<p>For the initial import <tt>git-archimport</tt> expects to find itself in an empty
+<p>For the initial import, <tt>git-archimport</tt> expects to find itself in an empty
directory. To follow the development of a project that uses Arch, rerun
<tt>git-archimport</tt> with the same parameters as the initial import to perform
incremental imports.</p>
-<p>While git-archimport will try to create sensible branch names for the
+<p>While <tt>git-archimport</tt> will try to create sensible branch names for the
archives that it imports, it is also possible to specify git branch names
manually. To do so, write a git branch name after each &lt;archive/branch&gt;
parameter, separated by a colon. This way, you can shorten the Arch
@@ -364,7 +364,7 @@
<dd>
<p>
Use this for compatibility with old-style branch names used by
- earlier versions of git-archimport. Old-style branch names
+ earlier versions of <tt>git-archimport</tt>. Old-style branch names
were category--branch, whereas new-style branch names are
archive,category--branch--version. In both cases, names given
on the command-line will override the automatically-generated
@@ -422,7 +422,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:20 UTC
+Last updated 02-Jul-2008 03:01:32 UTC
</div>
</div>
</body>
View
8 git-archimport.txt
@@ -9,7 +9,7 @@ git-archimport - Import an Arch repository into git
SYNOPSIS
--------
[verse]
-'git-archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
+'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
<archive/branch>[:<git-branch>] ...
DESCRIPTION
@@ -34,12 +34,12 @@ Arch repository.
Make sure you have a recent version of `tla` available in the path. `tla` must
know about the repositories you pass to `git-archimport`.
-For the initial import `git-archimport` expects to find itself in an empty
+For the initial import, `git-archimport` expects to find itself in an empty
directory. To follow the development of a project that uses Arch, rerun
`git-archimport` with the same parameters as the initial import to perform
incremental imports.
-While git-archimport will try to create sensible branch names for the
+While `git-archimport` will try to create sensible branch names for the
archives that it imports, it is also possible to specify git branch names
manually. To do so, write a git branch name after each <archive/branch>
parameter, separated by a colon. This way, you can shorten the Arch
@@ -84,7 +84,7 @@ OPTIONS
-o::
Use this for compatibility with old-style branch names used by
- earlier versions of git-archimport. Old-style branch names
+ earlier versions of `git-archimport`. Old-style branch names
were category--branch, whereas new-style branch names are
archive,category--branch--version. In both cases, names given
on the command-line will override the automatically-generated
View
10 git-archive.html
@@ -273,7 +273,7 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-archive</em> --format=&lt;fmt&gt; [--list] [--prefix=&lt;prefix&gt;/] [&lt;extra&gt;]
+<div class="content"><em>git archive</em> --format=&lt;fmt&gt; [--list] [--prefix=&lt;prefix&gt;/] [&lt;extra&gt;]
[--remote=&lt;repo&gt; [--exec=&lt;git-upload-archive&gt;]] &lt;tree-ish&gt;
[path&#8230;]</div></div>
</div>
@@ -283,13 +283,13 @@
structure for the named tree, and writes it out to the standard
output. If &lt;prefix&gt; is specified it is
prepended to the filenames in the archive.</p>
-<p><em>git-archive</em> behaves differently when given a tree ID versus when
+<p><tt>git-archive</tt> behaves differently when given a tree ID versus when
given a commit ID or tag ID. In the first case the current time is
used as modification time of each file in the archive. In the latter
case the commit time as recorded in the referenced commit object is
used instead. Additionally the commit ID is stored in a global
extended pax header if the tar format is used; it can be extracted
-using <em>git-get-tar-commit-id</em>. In ZIP files it is stored as a file
+using <tt>git-get-tar-commit-id</tt>. In ZIP files it is stored as a file
comment.</p>
</div>
<h2>OPTIONS</h2>
@@ -358,7 +358,7 @@
<dd>
<p>
Used with --remote to specify the path to the
- git-upload-archive executable on the remote side.
+ <tt>git-upload-archive</tt> on the remote side.
</p>
</dd>
<dt>
@@ -475,7 +475,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:19 UTC
+Last updated 02-Jul-2008 03:01:32 UTC
</div>
</div>
</body>
View
8 git-archive.txt
@@ -9,7 +9,7 @@ git-archive - Create an archive of files from a named tree
SYNOPSIS
--------
[verse]
-'git-archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
[--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
[path...]
@@ -20,13 +20,13 @@ structure for the named tree, and writes it out to the standard
output. If <prefix> is specified it is
prepended to the filenames in the archive.
-'git-archive' behaves differently when given a tree ID versus when
+`git-archive` behaves differently when given a tree ID versus when
given a commit ID or tag ID. In the first case the current time is
used as modification time of each file in the archive. In the latter
case the commit time as recorded in the referenced commit object is
used instead. Additionally the commit ID is stored in a global
extended pax header if the tar format is used; it can be extracted
-using 'git-get-tar-commit-id'. In ZIP files it is stored as a file
+using `git-get-tar-commit-id`. In ZIP files it is stored as a file
comment.
OPTIONS
@@ -57,7 +57,7 @@ OPTIONS
--exec=<git-upload-archive>::
Used with --remote to specify the path to the
- git-upload-archive executable on the remote side.
+ `git-upload-archive` on the remote side.
<tree-ish>::
The tree or commit to produce an archive for.
View
10 git-bisect.html
@@ -291,7 +291,7 @@
git bisect log
git bisect run &lt;cmd&gt;...</tt></pre>
</div></div>
-<p>This command uses <em>git-rev-list --bisect</em> option to help drive the
+<p>This command uses <tt>git rev-list --bisect</tt> to help drive the
binary search process to find which change introduced a bug, given an
old "good" commit object name and a later "bad" commit object name.</p>
<h3>Getting help</h3>
@@ -434,13 +434,13 @@
"revision that does not have this commit needs this patch applied to
work around other problem this bisection is not interested in")
applied to the revision being tested.</p>
-<p>To cope with such a situation, after the inner git-bisect finds the
+<p>To cope with such a situation, after the inner <tt>git-bisect</tt> finds the
next revision to test, with the "run" script, you can apply that tweak
before compiling, run the real test, and after the test decides if the
revision (possibly with the needed tweaks) passed the test, rewind the
tree to the pristine state. Finally the "run" script can exit with
-the status of the real test to let "git bisect run" command loop to
-know the outcome.</p>
+the status of the real test to let the "git bisect run" command loop to
+determine the outcome.</p>
</div>
<h2>EXAMPLES</h2>
<div class="sectionbody">
@@ -511,7 +511,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 15-Jun-2008 05:10:05 UTC
+Last updated 02-Jul-2008 03:01:32 UTC
</div>
</div>
</body>
View
8 git-bisect.txt
@@ -26,7 +26,7 @@ on the subcommand:
git bisect log
git bisect run <cmd>...
-This command uses 'git-rev-list --bisect' option to help drive the
+This command uses `git rev-list --bisect` to help drive the
binary search process to find which change introduced a bug, given an
old "good" commit object name and a later "bad" commit object name.
@@ -215,13 +215,13 @@ tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or
work around other problem this bisection is not interested in")
applied to the revision being tested.
-To cope with such a situation, after the inner git-bisect finds the
+To cope with such a situation, after the inner `git-bisect` finds the
next revision to test, with the "run" script, you can apply that tweak
before compiling, run the real test, and after the test decides if the
revision (possibly with the needed tweaks) passed the test, rewind the
tree to the pristine state. Finally the "run" script can exit with
-the status of the real test to let "git bisect run" command loop to
-know the outcome.
+the status of the real test to let the "git bisect run" command loop to
+determine the outcome.
EXAMPLES
--------
View
8 git-blame.html
@@ -273,7 +273,7 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-blame</em> [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
+<div class="content"><em>git blame</em> [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
[-S &lt;revs-file&gt;] [-M] [-C] [-C] [--since=&lt;date&gt;]
[&lt;rev&gt; | --contents &lt;file&gt;] [--] &lt;file&gt;</div></div>
</div>
@@ -283,7 +283,7 @@
last modified the line. Optionally, start annotating from the given revision.</p>
<p>Also it can limit the range of lines annotated.</p>
<p>This report doesn't tell you anything about lines which have been deleted or
-replaced; you need to use a tool such as <a href="git-diff.html">git-diff(1)</a> or the "pickaxe"
+replaced; you need to use a tool such as <tt>git-diff</tt> or the "pickaxe"
interface briefly mentioned in the following paragraph.</p>
<p>Apart from supporting file annotation, git also supports searching the
development history for when a code snippet occurred in a change. This makes it
@@ -480,7 +480,7 @@
file (see <tt>-M</tt>). The first number listed is the score.
This is the number of alphanumeric characters detected
to be moved between or within files. This must be above
- a certain threshold for git-blame to consider those lines
+ a certain threshold for <tt>git-blame</tt> to consider those lines
of code to have been moved.
</p>
</dd>
@@ -698,7 +698,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:19 UTC
+Last updated 02-Jul-2008 03:01:33 UTC
</div>
</div>
</body>
View
6 git-blame.txt
@@ -8,7 +8,7 @@ git-blame - Show what revision and author last modified each line of a file
SYNOPSIS
--------
[verse]
-'git-blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
+'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
[-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
[<rev> | --contents <file>] [--] <file>
@@ -21,7 +21,7 @@ last modified the line. Optionally, start annotating from the given revision.
Also it can limit the range of lines annotated.
This report doesn't tell you anything about lines which have been deleted or
-replaced; you need to use a tool such as linkgit:git-diff[1] or the "pickaxe"
+replaced; you need to use a tool such as `git-diff` or the "pickaxe"
interface briefly mentioned in the following paragraph.
Apart from supporting file annotation, git also supports searching the
@@ -49,7 +49,7 @@ include::blame-options.txt[]
file (see `-M`). The first number listed is the score.
This is the number of alphanumeric characters detected
to be moved between or within files. This must be above
- a certain threshold for git-blame to consider those lines
+ a certain threshold for `git-blame` to consider those lines
of code to have been moved.
-f::
View
18 git-branch.html
@@ -273,12 +273,12 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-branch</em> [--color | --no-color] [-r | -a] [--merged | --no-merged]
+<div class="content"><em>git branch</em> [--color | --no-color] [-r | -a] [--merged | --no-merged]
[-v [--abbrev=&lt;length&gt; | --no-abbrev]]
[--contains &lt;commit&gt;]
-<em>git-branch</em> [--track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
-<em>git-branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;
-<em>git-branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div></div>
+<em>git branch</em> [--track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
+<em>git branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;
+<em>git branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -299,7 +299,7 @@
working tree to it; use "git checkout &lt;newbranch&gt;" to switch to the
new branch.</p>
<p>When a local branch is started off a remote branch, git sets up the
-branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from
+branch so that <tt>git-pull</tt> will appropriately merge from
the remote branch. This behavior may be changed via the global
<tt>branch.autosetupmerge</tt> configuration flag. That setting can be
overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p>
@@ -313,7 +313,7 @@
has a reflog then the reflog will also be deleted.</p>
<p>Use -r together with -d to delete remote-tracking branches. Note, that it
only makes sense to delete remote-tracking branches if they no longer exist
-in remote repository or if <a href="git-fetch.html">git-fetch(1)</a> was configured not to fetch
+in remote repository or if <tt>git-fetch</tt> was configured not to fetch
them again. See also <em>prune</em> subcommand of <a href="git-remote.html">git-remote(1)</a> for way to
clean up all obsolete remote-tracking branches.</p>
</div>
@@ -437,14 +437,14 @@
</dt>
<dd>
<p>
- When creating a new branch, set up configuration so that git-pull
+ When creating a new branch, set up configuration so that <tt>git-pull</tt>
will automatically retrieve data from the start point, which must be
a branch. Use this if you always pull from the same upstream branch
into the new branch, and if you don't want to use "git pull
&lt;repository&gt; &lt;refspec&gt;" explicitly. This behavior is the default
when the start point is a remote branch. Set the
branch.autosetupmerge configuration variable to <tt>false</tt> if you want
- git-checkout and git-branch to always behave as if <em>--no-track</em> were
+ <tt>git-checkout</tt> and <tt>git-branch</tt> to always behave as if <em>--no-track</em> were
given. Set it to <tt>always</tt> if you want this behavior when the
start-point is either a local or remote branch.
</p>
@@ -616,7 +616,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:20 UTC
+Last updated 02-Jul-2008 03:01:33 UTC
</div>
</div>
</body>
View
16 git-branch.txt
@@ -8,12 +8,12 @@ git-branch - List, create, or delete branches
SYNOPSIS
--------
[verse]
-'git-branch' [--color | --no-color] [-r | -a] [--merged | --no-merged]
+'git branch' [--color | --no-color] [-r | -a] [--merged | --no-merged]
[-v [--abbrev=<length> | --no-abbrev]]
[--contains <commit>]
-'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
-'git-branch' (-m | -M) [<oldbranch>] <newbranch>
-'git-branch' (-d | -D) [-r] <branchname>...
+'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
+'git branch' (-m | -M) [<oldbranch>] <newbranch>
+'git branch' (-d | -D) [-r] <branchname>...
DESCRIPTION
-----------
@@ -37,7 +37,7 @@ working tree to it; use "git checkout <newbranch>" to switch to the
new branch.
When a local branch is started off a remote branch, git sets up the
-branch so that linkgit:git-pull[1] will appropriately merge from
+branch so that `git-pull` will appropriately merge from
the remote branch. This behavior may be changed via the global
`branch.autosetupmerge` configuration flag. That setting can be
overridden by using the `--track` and `--no-track` options.
@@ -54,7 +54,7 @@ has a reflog then the reflog will also be deleted.
Use -r together with -d to delete remote-tracking branches. Note, that it
only makes sense to delete remote-tracking branches if they no longer exist
-in remote repository or if linkgit:git-fetch[1] was configured not to fetch
+in remote repository or if `git-fetch` was configured not to fetch
them again. See also 'prune' subcommand of linkgit:git-remote[1] for way to
clean up all obsolete remote-tracking branches.
@@ -107,14 +107,14 @@ OPTIONS
Display the full sha1s in output listing rather than abbreviating them.
--track::
- When creating a new branch, set up configuration so that git-pull
+ When creating a new branch, set up configuration so that `git-pull`
will automatically retrieve data from the start point, which must be
a branch. Use this if you always pull from the same upstream branch
into the new branch, and if you don't want to use "git pull
<repository> <refspec>" explicitly. This behavior is the default
when the start point is a remote branch. Set the
branch.autosetupmerge configuration variable to `false` if you want
- git-checkout and git-branch to always behave as if '--no-track' were
+ `git-checkout` and `git-branch` to always behave as if '--no-track' were
given. Set it to `always` if you want this behavior when the
start-point is either a local or remote branch.
View
43 git-bundle.html
@@ -273,20 +273,20 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-bundle</em> create &lt;file&gt; &lt;git-rev-list args&gt;
-<em>git-bundle</em> verify &lt;file&gt;
-<em>git-bundle</em> list-heads &lt;file&gt; [refname&#8230;]
-<em>git-bundle</em> unbundle &lt;file&gt; [refname&#8230;]</div></div>
+<div class="content"><em>git bundle</em> create &lt;file&gt; &lt;git-rev-list args&gt;
+<em>git bundle</em> verify &lt;file&gt;
+<em>git bundle</em> list-heads &lt;file&gt; [refname&#8230;]
+<em>git bundle</em> unbundle &lt;file&gt; [refname&#8230;]</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
<p>Some workflows require that one or more branches of development on one
machine be replicated on another machine, but the two machines cannot
be directly connected so the interactive git protocols (git, ssh,
rsync, http) cannot be used. This command provides support for
-git-fetch and git-pull to operate by packaging objects and references
+<tt>git-fetch</tt> and <tt>git-pull</tt> to operate by packaging objects and references
in an archive at the originating machine, then importing those into
-another repository using <a href="git-fetch.html">git-fetch(1)</a> and <a href="git-pull.html">git-pull(1)</a>
+another repository using <tt>git-fetch</tt> and <tt>git-pull</tt>
after moving the archive by some means (i.e., by sneakernet). As no
direct connection between repositories exists, the user must specify a
basis for the bundle that is held by the destination repository: the
@@ -302,7 +302,7 @@
<dd>
<p>
Used to create a bundle named <em>file</em>. This requires the
- git-rev-list arguments to define the bundle contents.
+ <tt>git-rev-list</tt> arguments to define the bundle contents.
</p>
</dd>
<dt>
@@ -314,7 +314,7 @@
cleanly to the current repository. This includes checks on the
bundle format itself as well as checking that the prerequisite
commits exist and are fully linked in the current repository.
- git-bundle prints a list of missing commits, if any, and exits
+ <tt>git-bundle</tt> prints a list of missing commits, if any, and exits
with non-zero status.
</p>
</dd>
@@ -333,21 +333,20 @@
</dt>
<dd>
<p>
- Passes the objects in the bundle to <a href="git-index-pack.html">git-index-pack(1)</a>
+ Passes the objects in the bundle to <tt>git-index-pack</tt>
for storage in the repository, then prints the names of all
defined references. If a reflist is given, only references
matching those in the given list are printed. This command is
- really plumbing, intended to be called only by
- <a href="git-fetch.html">git-fetch(1)</a>.
+ really plumbing, intended to be called only by <tt>git-fetch</tt>.
</p>
</dd>
<dt>
[git-rev-list-args&#8230;]
</dt>
<dd>
<p>
- A list of arguments, acceptable to git-rev-parse and
- git-rev-list, that specify the specific objects and references
+ A list of arguments, acceptable to <tt>git-rev-parse</tt> and
+ <tt>git-rev-list</tt>, that specify the specific objects and references
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
@@ -361,18 +360,18 @@
<dd>
<p>
A list of references used to limit the references reported as
- available. This is principally of use to git-fetch, which
+ available. This is principally of use to <tt>git-fetch</tt>, which
expects to receive only those references asked for and not
- necessarily everything in the pack (in this case, git-bundle is
- acting like <a href="git-fetch-pack.html">git-fetch-pack(1)</a>).
+ necessarily everything in the pack (in this case, <tt>git-bundle</tt> is
+ acting like <tt>git-fetch-pack</tt>).
</p>
</dd>
</dl>
</div>
<h2>SPECIFYING REFERENCES</h2>
<div class="sectionbody">
-<p>git-bundle will only package references that are shown by
-git-show-ref: this includes heads, tags, and remote heads. References
+<p><tt>git-bundle</tt> will only package references that are shown by
+<tt>git-show-ref</tt>: this includes heads, tags, and remote heads. References
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
@@ -414,7 +413,7 @@
</ul>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git-bundle create mybundle master ^lastR2bundle
+<pre><tt>$ git bundle create mybundle master ^lastR2bundle
$ git tag -f lastR2bundle master</tt></pre>
</div></div>
<ul>
@@ -453,8 +452,8 @@
<p>Then you move mybundle from A to B, and in R2 on B:</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git-bundle verify mybundle
-$ git-fetch mybundle master:localRef</tt></pre>
+<pre><tt>$ git bundle verify mybundle
+$ git fetch mybundle master:localRef</tt></pre>
</div></div>
<p>With something like this in the config in R2:</p>
<div class="listingblock">
@@ -484,7 +483,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:22 UTC
+Last updated 02-Jul-2008 03:01:33 UTC
</div>
</div>
</body>
View
41 git-bundle.txt
@@ -9,10 +9,10 @@ git-bundle - Move objects and refs by archive
SYNOPSIS
--------
[verse]
-'git-bundle' create <file> <git-rev-list args>
-'git-bundle' verify <file>
-'git-bundle' list-heads <file> [refname...]
-'git-bundle' unbundle <file> [refname...]
+'git bundle' create <file> <git-rev-list args>
+'git bundle' verify <file>
+'git bundle' list-heads <file> [refname...]
+'git bundle' unbundle <file> [refname...]
DESCRIPTION
-----------
@@ -21,9 +21,9 @@ Some workflows require that one or more branches of development on one
machine be replicated on another machine, but the two machines cannot
be directly connected so the interactive git protocols (git, ssh,
rsync, http) cannot be used. This command provides support for
-git-fetch and git-pull to operate by packaging objects and references
+`git-fetch` and `git-pull` to operate by packaging objects and references
in an archive at the originating machine, then importing those into
-another repository using linkgit:git-fetch[1] and linkgit:git-pull[1]
+another repository using `git-fetch` and `git-pull`
after moving the archive by some means (i.e., by sneakernet). As no
direct connection between repositories exists, the user must specify a
basis for the bundle that is held by the destination repository: the
@@ -35,14 +35,14 @@ OPTIONS
create <file>::
Used to create a bundle named 'file'. This requires the
- git-rev-list arguments to define the bundle contents.
+ `git-rev-list` arguments to define the bundle contents.
verify <file>::
Used to check that a bundle file is valid and will apply
cleanly to the current repository. This includes checks on the
bundle format itself as well as checking that the prerequisite
commits exist and are fully linked in the current repository.
- git-bundle prints a list of missing commits, if any, and exits
+ `git-bundle` prints a list of missing commits, if any, and exits
with non-zero status.
list-heads <file>::
@@ -51,16 +51,15 @@ list-heads <file>::
printed out.
unbundle <file>::
- Passes the objects in the bundle to linkgit:git-index-pack[1]
+ Passes the objects in the bundle to `git-index-pack`
for storage in the repository, then prints the names of all
defined references. If a reflist is given, only references
matching those in the given list are printed. This command is
- really plumbing, intended to be called only by
- linkgit:git-fetch[1].
+ really plumbing, intended to be called only by `git-fetch`.
[git-rev-list-args...]::
- A list of arguments, acceptable to git-rev-parse and
- git-rev-list, that specify the specific objects and references
+ A list of arguments, acceptable to `git-rev-parse` and
+ `git-rev-list`, that specify the specific objects and references
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
@@ -70,16 +69,16 @@ unbundle <file>::
[refname...]::
A list of references used to limit the references reported as
- available. This is principally of use to git-fetch, which
+ available. This is principally of use to `git-fetch`, which
expects to receive only those references asked for and not
- necessarily everything in the pack (in this case, git-bundle is
- acting like linkgit:git-fetch-pack[1]).
+ necessarily everything in the pack (in this case, `git-bundle` is
+ acting like `git-fetch-pack`).
SPECIFYING REFERENCES
---------------------
-git-bundle will only package references that are shown by
-git-show-ref: this includes heads, tags, and remote heads. 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~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
@@ -116,7 +115,7 @@ We set a tag in R1 (lastR2bundle) after the previous such transport,
and move it afterwards to help build the bundle.
------------
-$ git-bundle create mybundle master ^lastR2bundle
+$ git bundle create mybundle master ^lastR2bundle
$ git tag -f lastR2bundle master
------------
@@ -141,8 +140,8 @@ $ git bundle create mybundle master -n 10
Then you move mybundle from A to B, and in R2 on B:
------------
-$ git-bundle verify mybundle
-$ git-fetch mybundle master:localRef
+$ git bundle verify mybundle
+$ git fetch mybundle master:localRef
------------
With something like this in the config in R2:
View
6 git-cat-file.html
@@ -273,8 +273,8 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-cat-file</em> [-t | -s | -e | -p | &lt;type&gt;] &lt;object&gt;
-<em>git-cat-file</em> [--batch | --batch-check] &lt; &lt;list-of-objects&gt;</div></div>
+<div class="content"><em>git cat-file</em> [-t | -s | -e | -p | &lt;type&gt;] &lt;object&gt;
+<em>git cat-file</em> [--batch | --batch-check] &lt; &lt;list-of-objects&gt;</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -407,7 +407,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 11-Jun-2008 07:52:11 UTC
+Last updated 02-Jul-2008 03:01:34 UTC
</div>
</div>
</body>
View
4 git-cat-file.txt
@@ -9,8 +9,8 @@ git-cat-file - Provide content or type/size information for repository objects
SYNOPSIS
--------
[verse]
-'git-cat-file' [-t | -s | -e | -p | <type>] <object>
-'git-cat-file' [--batch | --batch-check] < <list-of-objects>
+'git cat-file' [-t | -s | -e | -p | <type>] <object>
+'git cat-file' [--batch | --batch-check] < <list-of-objects>
DESCRIPTION
-----------
View
4 git-check-attr.html
@@ -272,7 +272,7 @@
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-check-attr</em> attr&#8230; [--] pathname&#8230;</p>
+<p><em>git check-attr</em> attr&#8230; [--] pathname&#8230;</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -312,7 +312,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:23 UTC
+Last updated 02-Jul-2008 03:01:34 UTC
</div>
</div>
</body>
View
2 git-check-attr.txt
@@ -8,7 +8,7 @@ git-check-attr - Display gitattributes information.
SYNOPSIS
--------
-'git-check-attr' attr... [--] pathname...
+'git check-attr' attr... [--] pathname...
DESCRIPTION
-----------
View
6 git-check-ref-format.html
@@ -272,7 +272,7 @@
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-check-ref-format</em> &lt;refname&gt;</p>
+<p><em>git check-ref-format</em> &lt;refname&gt;</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -332,7 +332,7 @@
colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
value and store it in dstref" in fetch and push operations.
It may also be used to select a specific object such as with
- <a href="git-cat-file.html">git-cat-file(1)</a> "git-cat-file blob v1.3.3:refs.c".
+ <tt>git-cat-file</tt>: "git cat-file blob v1.3.3:refs.c".
</p>
</li>
</ol>
@@ -343,7 +343,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:25 UTC
+Last updated 02-Jul-2008 03:01:35 UTC
</div>
</div>
</body>
View
4 git-check-ref-format.txt
@@ -7,7 +7,7 @@ git-check-ref-format - Make sure ref name is well formed
SYNOPSIS
--------
-'git-check-ref-format' <refname>
+'git check-ref-format' <refname>
DESCRIPTION
-----------
@@ -47,7 +47,7 @@ refname expressions (see linkgit:git-rev-parse[1]). Namely:
. colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
value and store it in dstref" in fetch and push operations.
It may also be used to select a specific object such as with
- linkgit:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".
+ `git-cat-file`: "git cat-file blob v1.3.3:refs.c".
GIT
View
24 git-checkout-index.html
@@ -273,7 +273,7 @@
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-checkout-index</em> [-u] [-q] [-a] [-f] [-n] [--prefix=&lt;string&gt;]
+<div class="content"><em>git checkout-index</em> [-u] [-q] [-a] [-f] [-n] [--prefix=&lt;string&gt;]
[--stage=&lt;number&gt;|all]
[--temp]
[-z] [--stdin]
@@ -403,23 +403,23 @@
</dd>
</dl>
<p>The order of the flags used to matter, but not anymore.</p>
-<p>Just doing <tt>git-checkout-index</tt> does nothing. You probably meant
-<tt>git-checkout-index -a</tt>. And if you want to force it, you want
-<tt>git-checkout-index -f -a</tt>.</p>
+<p>Just doing <tt>git checkout-index</tt> does nothing. You probably meant
+<tt>git checkout-index -a</tt>. And if you want to force it, you want
+<tt>git checkout-index -f -a</tt>.</p>
<p>Intuitiveness is not the goal here. Repeatability is. The reason for
the "no arguments means no work" behavior is that from scripts you are
supposed to be able to do:</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ find . -name '*.h' -print0 | xargs -0 git-checkout-index -f --</tt></pre>
+<pre><tt>$ find . -name '*.h' -print0 | xargs -0 git checkout-index -f --</tt></pre>
</div></div>
<p>which will force all existing <tt>*.h</tt> files to be replaced with their
cached copies. If an empty command line implied "all", then this would
force-refresh everything in the index, which was not the point. But
-since git-checkout-index accepts --stdin it would be faster to use:</p>
+since <tt>git-checkout-index</tt> accepts --stdin it would be faster to use:</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ find . -name '*.h' -print0 | git-checkout-index -f -z --stdin</tt></pre>
+<pre><tt>$ find . -name '*.h' -print0 | git checkout-index -f -z --stdin</tt></pre>
</div></div>
<p>The <tt>--</tt> is just a good idea when you know the rest will be filenames;
it will prevent problems with a filename of, for example, <tt>-a</tt>.
@@ -476,7 +476,7 @@
<dd>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git-checkout-index -n -f -a &amp;&amp; git-update-index --ignore-missing --refresh</tt></pre>
+<pre><tt>$ git checkout-index -n -f -a &amp;&amp; git update-index --ignore-missing --refresh</tt></pre>
</div></div>
</dd>
<dt>
@@ -490,9 +490,9 @@
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git-checkout-index --prefix=git-export-dir/ -a</tt></pre>
+<pre><tt>$ git checkout-index --prefix=git-export-dir/ -a</tt></pre>
</div></div>
-<p><tt>git-checkout-index</tt> will "export" the index into the specified
+<p><tt>git checkout-index</tt> will "export" the index into the specified
directory.</p>
<p>The final "/" is important. The exported name is literally just
prefixed with the specified string. Contrast this with the
@@ -504,7 +504,7 @@
<dd>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git-checkout-index --prefix=.merged- Makefile</tt></pre>
+<pre><tt>$ git checkout-index --prefix=.merged- Makefile</tt></pre>
</div></div>
<p>This will check out the currently cached copy of <tt>Makefile</tt>
into the file <tt>.merged-Makefile</tt>.</p>
@@ -526,7 +526,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:21 UTC
+Last updated 02-Jul-2008 03:01:34 UTC
</div>
</div>
</body>
View
22 git-checkout-index.txt