Skip to content

Commit 35738e8

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62
1 parent 14b7648 commit 35738e8

File tree

324 files changed

+931
-898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+931
-898
lines changed

‎RelNotes-1.5.4.txt‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,10 @@ Updates since v1.5.3
212212
* "git add -p" is a short-hand to go directly to the selective patch
213213
subcommand in the interactive command loop and to exit when done.
214214

215-
* "git add -i" UI has been colorized.
215+
* "git add -i" UI has been colorized. The interactive prompt
216+
and menu can be colored by setting color.interactive
217+
configuration. The diff output (including the hunk picker)
218+
are colored with color.diff configuration.
216219

217220
* "git commit --allow-empty" allows you to create a single-parent
218221
commit that records the same tree as its parent, overriding the usual
@@ -231,6 +234,11 @@ Updates since v1.5.3
231234
a UI mistake. Use "git stash save random-text", or "git stash"
232235
(without extra args) for that.
233236

237+
* "git stash clear extra-text" does not clear the whole stash
238+
anymore. It is tempting to expect "git stash clear stash@{2}"
239+
to drop only a single named stash entry, and it is rude to
240+
discard everything when that is asked (but not provided).
241+
234242
* "git prune --expire <time>" can exempt young loose objects from
235243
getting pruned.
236244

@@ -345,8 +353,11 @@ series.
345353
* "git config" did not work correctly on platforms that define
346354
REG_NOMATCH to an even number.
347355

356+
* Recent versions of AsciiDoc 8 has a change to break our
357+
documentation; a workaround has been implemented.
358+
348359
--
349360
exec >/var/tmp/1
350-
O=v1.5.4-rc2-37-ge0cd252
361+
O=v1.5.4-rc2-59-g2370781
351362
echo O=`git describe refs/heads/master`
352363
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

‎blame-options.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ of lines before or after the line given by <start>.
3939
Show raw timestamp (Default: off).
4040

4141
-S <revs-file>::
42-
Use revs from revs-file instead of calling gitlink:git-rev-list[1].
42+
Use revs from revs-file instead of calling linkgit:git-rev-list[1].
4343

4444
-p, --porcelain::
4545
Show in a format designed for machine consumption.

‎cmds-ancillaryinterrogators.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
gitlink:git-annotate[1]::
1+
linkgit:git-annotate[1]::
22
Annotate file lines with commit info.
33

4-
gitlink:git-blame[1]::
4+
linkgit:git-blame[1]::
55
Show what revision and author last modified each line of a file.
66

7-
gitlink:git-cherry[1]::
7+
linkgit:git-cherry[1]::
88
Find commits not merged upstream.
99

10-
gitlink:git-count-objects[1]::
10+
linkgit:git-count-objects[1]::
1111
Count unpacked number of objects and their disk consumption.
1212

13-
gitlink:git-fsck[1]::
13+
linkgit:git-fsck[1]::
1414
Verifies the connectivity and validity of the objects in the database.
1515

16-
gitlink:git-get-tar-commit-id[1]::
16+
linkgit:git-get-tar-commit-id[1]::
1717
Extract commit ID from an archive created using git-archive.
1818

19-
gitlink:git-help[1]::
19+
linkgit:git-help[1]::
2020
display help information about git.
2121

22-
gitlink:git-instaweb[1]::
22+
linkgit:git-instaweb[1]::
2323
Instantly browse your working repository in gitweb.
2424

25-
gitlink:git-merge-tree[1]::
25+
linkgit:git-merge-tree[1]::
2626
Show three-way merge without touching index.
2727

28-
gitlink:git-rerere[1]::
28+
linkgit:git-rerere[1]::
2929
Reuse recorded resolution of conflicted merges.
3030

31-
gitlink:git-rev-parse[1]::
31+
linkgit:git-rev-parse[1]::
3232
Pick out and massage parameters.
3333

34-
gitlink:git-show-branch[1]::
34+
linkgit:git-show-branch[1]::
3535
Show branches and their commits.
3636

37-
gitlink:git-verify-tag[1]::
37+
linkgit:git-verify-tag[1]::
3838
Check the GPG signature of tags.
3939

40-
gitlink:git-whatchanged[1]::
40+
linkgit:git-whatchanged[1]::
4141
Show logs with difference each commit introduces.
4242

‎cmds-ancillarymanipulators.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
gitlink:git-config[1]::
1+
linkgit:git-config[1]::
22
Get and set repository or global options.
33

4-
gitlink:git-fast-export[1]::
4+
linkgit:git-fast-export[1]::
55
Git data exporter.
66

7-
gitlink:git-fast-import[1]::
7+
linkgit:git-fast-import[1]::
88
Backend for fast Git data importers.
99

10-
gitlink:git-filter-branch[1]::
10+
linkgit:git-filter-branch[1]::
1111
Rewrite branches.
1212

13-
gitlink:git-lost-found[1]::
13+
linkgit:git-lost-found[1]::
1414
(deprecated) Recover lost refs that luckily have not yet been pruned.
1515

16-
gitlink:git-mergetool[1]::
16+
linkgit:git-mergetool[1]::
1717
Run merge conflict resolution tools to resolve merge conflicts.
1818

19-
gitlink:git-pack-refs[1]::
19+
linkgit:git-pack-refs[1]::
2020
Pack heads and tags for efficient repository access.
2121

22-
gitlink:git-prune[1]::
22+
linkgit:git-prune[1]::
2323
Prune all unreachable objects from the object database.
2424

25-
gitlink:git-reflog[1]::
25+
linkgit:git-reflog[1]::
2626
Manage reflog information.
2727

28-
gitlink:git-relink[1]::
28+
linkgit:git-relink[1]::
2929
Hardlink common objects in local repositories.
3030

31-
gitlink:git-remote[1]::
31+
linkgit:git-remote[1]::
3232
manage set of tracked repositories.
3333

34-
gitlink:git-repack[1]::
34+
linkgit:git-repack[1]::
3535
Pack unpacked objects in a repository.
3636

‎cmds-foreignscminterface.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
gitlink:git-archimport[1]::
1+
linkgit:git-archimport[1]::
22
Import an Arch repository into git.
33

4-
gitlink:git-cvsexportcommit[1]::
4+
linkgit:git-cvsexportcommit[1]::
55
Export a single commit to a CVS checkout.
66

7-
gitlink:git-cvsimport[1]::
7+
linkgit:git-cvsimport[1]::
88
Salvage your data out of another SCM people love to hate.
99

10-
gitlink:git-cvsserver[1]::
10+
linkgit:git-cvsserver[1]::
1111
A CVS server emulator for git.
1212

13-
gitlink:git-imap-send[1]::
13+
linkgit:git-imap-send[1]::
1414
Dump a mailbox from stdin into an imap folder.
1515

16-
gitlink:git-quiltimport[1]::
16+
linkgit:git-quiltimport[1]::
1717
Applies a quilt patchset onto the current branch.
1818

19-
gitlink:git-request-pull[1]::
19+
linkgit:git-request-pull[1]::
2020
Generates a summary of pending changes.
2121

22-
gitlink:git-send-email[1]::
22+
linkgit:git-send-email[1]::
2323
Send a collection of patches as emails.
2424

25-
gitlink:git-svn[1]::
25+
linkgit:git-svn[1]::
2626
Bidirectional operation between a single Subversion branch and git.
2727

‎cmds-mainporcelain.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,108 @@
1-
gitlink:git-add[1]::
1+
linkgit:git-add[1]::
22
Add file contents to the index.
33

4-
gitlink:git-am[1]::
4+
linkgit:git-am[1]::
55
Apply a series of patches from a mailbox.
66

7-
gitlink:git-archive[1]::
7+
linkgit:git-archive[1]::
88
Create an archive of files from a named tree.
99

10-
gitlink:git-bisect[1]::
10+
linkgit:git-bisect[1]::
1111
Find the change that introduced a bug by binary search.
1212

13-
gitlink:git-branch[1]::
13+
linkgit:git-branch[1]::
1414
List, create, or delete branches.
1515

16-
gitlink:git-bundle[1]::
16+
linkgit:git-bundle[1]::
1717
Move objects and refs by archive.
1818

19-
gitlink:git-checkout[1]::
19+
linkgit:git-checkout[1]::
2020
Checkout and switch to a branch.
2121

22-
gitlink:git-cherry-pick[1]::
22+
linkgit:git-cherry-pick[1]::
2323
Apply the change introduced by an existing commit.
2424

25-
gitlink:git-citool[1]::
25+
linkgit:git-citool[1]::
2626
Graphical alternative to git-commit.
2727

28-
gitlink:git-clean[1]::
28+
linkgit:git-clean[1]::
2929
Remove untracked files from the working tree.
3030

31-
gitlink:git-clone[1]::
31+
linkgit:git-clone[1]::
3232
Clone a repository into a new directory.
3333

34-
gitlink:git-commit[1]::
34+
linkgit:git-commit[1]::
3535
Record changes to the repository.
3636

37-
gitlink:git-describe[1]::
37+
linkgit:git-describe[1]::
3838
Show the most recent tag that is reachable from a commit.
3939

40-
gitlink:git-diff[1]::
40+
linkgit:git-diff[1]::
4141
Show changes between commits, commit and working tree, etc.
4242

43-
gitlink:git-fetch[1]::
43+
linkgit:git-fetch[1]::
4444
Download objects and refs from another repository.
4545

46-
gitlink:git-format-patch[1]::
46+
linkgit:git-format-patch[1]::
4747
Prepare patches for e-mail submission.
4848

49-
gitlink:git-gc[1]::
49+
linkgit:git-gc[1]::
5050
Cleanup unnecessary files and optimize the local repository.
5151

52-
gitlink:git-grep[1]::
52+
linkgit:git-grep[1]::
5353
Print lines matching a pattern.
5454

55-
gitlink:git-gui[1]::
55+
linkgit:git-gui[1]::
5656
A portable graphical interface to Git.
5757

58-
gitlink:git-init[1]::
58+
linkgit:git-init[1]::
5959
Create an empty git repository or reinitialize an existing one.
6060

61-
gitlink:git-log[1]::
61+
linkgit:git-log[1]::
6262
Show commit logs.
6363

64-
gitlink:git-merge[1]::
64+
linkgit:git-merge[1]::
6565
Join two or more development histories together.
6666

67-
gitlink:git-mv[1]::
67+
linkgit:git-mv[1]::
6868
Move or rename a file, a directory, or a symlink.
6969

70-
gitlink:git-pull[1]::
70+
linkgit:git-pull[1]::
7171
Fetch from and merge with another repository or a local branch.
7272

73-
gitlink:git-push[1]::
73+
linkgit:git-push[1]::
7474
Update remote refs along with associated objects.
7575

76-
gitlink:git-rebase[1]::
76+
linkgit:git-rebase[1]::
7777
Forward-port local commits to the updated upstream head.
7878

79-
gitlink:git-reset[1]::
79+
linkgit:git-reset[1]::
8080
Reset current HEAD to the specified state.
8181

82-
gitlink:git-revert[1]::
82+
linkgit:git-revert[1]::
8383
Revert an existing commit.
8484

85-
gitlink:git-rm[1]::
85+
linkgit:git-rm[1]::
8686
Remove files from the working tree and from the index.
8787

88-
gitlink:git-shortlog[1]::
88+
linkgit:git-shortlog[1]::
8989
Summarize 'git log' output.
9090

91-
gitlink:git-show[1]::
91+
linkgit:git-show[1]::
9292
Show various types of objects.
9393

94-
gitlink:git-stash[1]::
94+
linkgit:git-stash[1]::
9595
Stash the changes in a dirty working directory away.
9696

97-
gitlink:git-status[1]::
97+
linkgit:git-status[1]::
9898
Show the working tree status.
9999

100-
gitlink:git-submodule[1]::
100+
linkgit:git-submodule[1]::
101101
Initialize, update or inspect submodules.
102102

103-
gitlink:git-tag[1]::
103+
linkgit:git-tag[1]::
104104
Create, list, delete or verify a tag object signed with GPG.
105105

106-
gitlink:gitk[1]::
106+
linkgit:gitk[1]::
107107
The git repository browser.
108108

0 commit comments

Comments
 (0)