Documentation: rename gitlink macro to linkgit
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dan McGee committed
Dec 29, 2007 at 00:20 UTC
5162e69732d13dd079919a389a6ace8878aad716
149 files changed
+603
-603
Documentation/asciidoc.conf
+4
-4
@@ -1,6 +1,6 @@
1
-## gitlink: macro
1
+## linkgit: macro
2
#
3
-# Usage: gitlink:command[manpage-section]
3
+# Usage: linkgit:command[manpage-section]
4
#
5
# Note, {0} is the manpage section, while {target} is the command.
6
#
@@ -15,7 +15,7 @@ endsb=]
15
tilde=~
16
17
ifdef::backend-docbook[]
18
-[gitlink-inlinemacro]
18
+[linkgit-inlinemacro]
19
{0%{target}}
20
{0#<citerefentry>}
21
{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
@@ -61,6 +61,6 @@ endif::backend-docbook[]
61
endif::doctype-manpage[]
62
63
ifdef::backend-xhtml11[]
64
-[gitlink-inlinemacro]
64
+[linkgit-inlinemacro]
65
<a href="{target}.html">{target}{0?({0})}</a>
66
endif::backend-xhtml11[]
Documentation/blame-options.txt
+1
-1
@@ -39,7 +39,7 @@ of lines before or after the line given by <start>.
39
Show raw timestamp (Default: off).
40
41
-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].
43
44
-p, --porcelain::
45
Show in a format designed for machine consumption.
Documentation/cmd-list.perl
+1
-1
@@ -27,7 +27,7 @@ sub format_one {
27
die "No description found in $name.txt";
28
}
29
if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) {
30
- print $out "gitlink:$name\[1\]::\n\t";
30
+ print $out "linkgit:$name\[1\]::\n\t";
31
if ($attr =~ / deprecated /) {
32
print $out "(deprecated) ";
33
}
Documentation/config.txt
+63
-63
@@ -115,7 +115,7 @@ porcelain configuration variables in the respective porcelain documentation.
115
core.fileMode::
116
If false, the executable bit differences between the index and
117
the working copy are ignored; useful on broken filesystems like FAT.
118
- See gitlink:git-update-index[1]. True by default.
118
+ See linkgit:git-update-index[1]. True by default.
119
120
core.quotepath::
121
The commands that output paths (e.g. `ls-files`,
@@ -141,8 +141,8 @@ core.autocrlf::
141
142
core.symlinks::
143
If false, symbolic links are checked out as small plain files that
144
- contain the link text. gitlink:git-update-index[1] and
145
- gitlink:git-add[1] will not change the recorded type to regular
144
+ contain the link text. linkgit:git-update-index[1] and
145
+ linkgit:git-add[1] will not change the recorded type to regular
146
file. Useful on filesystems like FAT that do not support
147
symbolic links. True by default.
148
@@ -163,7 +163,7 @@ core.ignoreStat::
163
The working copy files are assumed to stay unchanged until you
164
mark them otherwise manually - Git will not detect the file changes
165
by lstat() calls. This is useful on systems where those are very
166
- slow, such as Microsoft Windows. See gitlink:git-update-index[1].
166
+ slow, such as Microsoft Windows. See linkgit:git-update-index[1].
167
False by default.
168
169
core.preferSymlinkRefs::
@@ -176,10 +176,10 @@ core.bare::
176
If true this repository is assumed to be 'bare' and has no
177
working directory associated with it. If this is the case a
178
number of commands that require a working directory will be
179
- disabled, such as gitlink:git-add[1] or gitlink:git-merge[1].
179
+ disabled, such as linkgit:git-add[1] or linkgit:git-merge[1].
180
+
181
-This setting is automatically guessed by gitlink:git-clone[1] or
182
-gitlink:git-init[1] when the repository was created. By default a
181
+This setting is automatically guessed by linkgit:git-clone[1] or
182
+linkgit:git-init[1] when the repository was created. By default a
183
repository that ends in "/.git" is assumed to be not bare (bare =
184
false), while all other repositories are assumed to be bare (bare
185
= true).
@@ -216,7 +216,7 @@ core.sharedRepository::
216
group-writable). When 'all' (or 'world' or 'everybody'), the
217
repository will be readable by all users, additionally to being
218
group-shareable. When 'umask' (or 'false'), git will use permissions
219
- reported by umask(2). See gitlink:git-init[1]. False by default.
219
+ reported by umask(2). See linkgit:git-init[1]. False by default.
220
221
core.warnAmbiguousRefs::
222
If true, git will warn you if the ref name you passed it is ambiguous
@@ -281,7 +281,7 @@ core.excludesfile::
281
In addition to '.gitignore' (per-directory) and
282
'.git/info/exclude', git looks into this file for patterns
283
of files which are not meant to be tracked. See
284
- gitlink:gitignore[5].
284
+ linkgit:gitignore[5].
285
286
core.editor::
287
Commands such as `commit` and `tag` that lets you edit
@@ -310,7 +310,7 @@ core.whitespace::
310
space characters as an error (not enabled by default).
311
312
alias.*::
313
- Command aliases for the gitlink:git[1] command wrapper - e.g.
313
+ Command aliases for the linkgit:git[1] command wrapper - e.g.
314
after defining "alias.last = cat-file commit HEAD", the invocation
315
"git last" is equivalent to "git cat-file commit HEAD". To avoid
316
confusion and troubles with script usage, aliases that
@@ -326,11 +326,11 @@ it will be treated as a shell command. For example, defining
326
327
apply.whitespace::
328
Tells `git-apply` how to handle whitespaces, in the same way
329
- as the '--whitespace' option. See gitlink:git-apply[1].
329
+ as the '--whitespace' option. See linkgit:git-apply[1].
330
331
branch.autosetupmerge::
332
Tells `git-branch` and `git-checkout` to setup new branches
333
- so that gitlink:git-pull[1] will appropriately merge from that
333
+ so that linkgit:git-pull[1] will appropriately merge from that
334
remote branch. Note that even if this option is not set,
335
this behavior can be chosen per-branch using the `--track`
336
and `--no-track` options. This option defaults to false.
@@ -356,7 +356,7 @@ branch.<name>.merge::
356
357
branch.<name>.mergeoptions::
358
Sets default options for merging into branch <name>. The syntax and
359
- supported options are equal to that of gitlink:git-merge[1], but
359
+ supported options are equal to that of linkgit:git-merge[1], but
360
option values containing whitespace characters are currently not
361
supported.
362
@@ -364,7 +364,7 @@ branch.<name>.rebase::
364
When true, rebase the branch <name> on top of the fetched branch,
365
instead of merging the default branch from the default remote.
366
*NOTE*: this is a possibly dangerous operation; do *not* use
367
- it unless you understand the implications (see gitlink:git-rebase[1]
367
+ it unless you understand the implications (see linkgit:git-rebase[1]
368
for details).
369
370
clean.requireForce::
@@ -373,7 +373,7 @@ clean.requireForce::
373
374
color.branch::
375
A boolean to enable/disable color in the output of
376
- gitlink:git-branch[1]. May be set to `always`,
376
+ linkgit:git-branch[1]. May be set to `always`,
377
`false` (or `never`) or `auto` (or `true`), in which case colors are used
378
only when the output is to a terminal. Defaults to false.
379
@@ -423,7 +423,7 @@ color.pager::
423
424
color.status::
425
A boolean to enable/disable color in the output of
426
- gitlink:git-status[1]. May be set to `always`,
426
+ linkgit:git-status[1]. May be set to `always`,
427
`false` (or `never`) or `auto` (or `true`), in which case colors are used
428
only when the output is to a terminal. Defaults to false.
429
@@ -453,7 +453,7 @@ diff.external::
453
performed using the internal diff machinery, but using the
454
given command. Note: if you want to use an external diff
455
program only on a subset of your files, you might want to
456
- use gitlink:gitattributes[5] instead.
456
+ use linkgit:gitattributes[5] instead.
457
458
diff.renameLimit::
459
The number of files to consider when performing the copy/rename
@@ -478,11 +478,11 @@ format.numbered::
478
A boolean which can enable sequence numbers in patch subjects.
479
Setting this option to "auto" will enable it only if there is
480
more than one patch. See --numbered option in
481
- gitlink:git-format-patch[1].
481
+ linkgit:git-format-patch[1].
482
483
format.headers::
484
Additional email headers to include in a patch to be submitted
485
- by mail. See gitlink:git-format-patch[1].
485
+ by mail. See linkgit:git-format-patch[1].
486
487
format.suffix::
488
The default for format-patch is to output files with the suffix
@@ -530,27 +530,27 @@ gc.reflogexpireunreachable::
530
gc.rerereresolved::
531
Records of conflicted merge you resolved earlier are
532
kept for this many days when `git rerere gc` is run.
533
- The default is 60 days. See gitlink:git-rerere[1].
533
+ The default is 60 days. See linkgit:git-rerere[1].
534
535
gc.rerereunresolved::
536
Records of conflicted merge you have not resolved are
537
kept for this many days when `git rerere gc` is run.
538
- The default is 15 days. See gitlink:git-rerere[1].
538
+ The default is 15 days. See linkgit:git-rerere[1].
539
540
rerere.enabled::
541
Activate recording of resolved conflicts, so that identical
542
conflict hunks can be resolved automatically, should they
543
- be encountered again. gitlink:git-rerere[1] command is by
543
+ be encountered again. linkgit:git-rerere[1] command is by
544
default enabled, but can be disabled by setting this option to
545
false.
546
547
gitcvs.enabled::
548
Whether the CVS server interface is enabled for this repository.
549
- See gitlink:git-cvsserver[1].
549
+ See linkgit:git-cvsserver[1].
550
551
gitcvs.logfile::
552
Path to a log file where the CVS server interface well... logs
553
- various stuff. See gitlink:git-cvsserver[1].
553
+ various stuff. See linkgit:git-cvsserver[1].
554
555
gitcvs.allbinary::
556
If true, all files are sent to the client in mode '-kb'. This
@@ -563,7 +563,7 @@ gitcvs.dbname::
563
derived from the git repository. The exact meaning depends on the
564
used database driver, for SQLite (which is the default driver) this
565
is a filename. Supports variable substitution (see
566
- gitlink:git-cvsserver[1] for details). May not contain semicolons (`;`).
566
+ linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
567
Default: '%Ggitcvs.%m.sqlite'
568
569
gitcvs.dbdriver::
@@ -572,13 +572,13 @@ gitcvs.dbdriver::
572
with 'DBD::SQLite', reported to work with 'DBD::Pg', and
573
reported *not* to work with 'DBD::mysql'. Experimental feature.
574
May not contain double colons (`:`). Default: 'SQLite'.
575
- See gitlink:git-cvsserver[1].
575
+ See linkgit:git-cvsserver[1].
576
577
gitcvs.dbuser, gitcvs.dbpass::
578
Database user and password. Only useful if setting 'gitcvs.dbdriver',
579
since SQLite has no concept of database users and/or passwords.
580
'gitcvs.dbuser' supports variable substitution (see
581
- gitlink:git-cvsserver[1] for details).
581
+ linkgit:git-cvsserver[1] for details).
582
583
All gitcvs variables except for 'gitcvs.allbinary' can also be
584
specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'
@@ -587,7 +587,7 @@ access method.
587
588
http.proxy::
589
Override the HTTP proxy, normally configured using the 'http_proxy'
590
- environment variable (see gitlink:curl[1]). This can be overridden
590
+ environment variable (see linkgit:curl[1]). This can be overridden
591
on a per-remote basis; see remote.<name>.proxy
592
593
http.sslVerify::
@@ -636,7 +636,7 @@ i18n.commitEncoding::
636
does not care per se, but this information is necessary e.g. when
637
importing commits from emails or in the gitk graphical history
638
browser (and possibly at other places in the future or in other
639
- porcelains). See e.g. gitlink:git-mailinfo[1]. Defaults to 'utf-8'.
639
+ porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
640
641
i18n.logOutputEncoding::
642
Character encoding the commit messages are converted to when
@@ -645,7 +645,7 @@ i18n.logOutputEncoding::
645
log.showroot::
646
If true, the initial commit will be shown as a big creation event.
647
This is equivalent to a diff against an empty tree.
648
- Tools like gitlink:git-log[1] or gitlink:git-whatchanged[1], which
648
+ Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
649
normally hide the root commit will now show it. True by default.
650
651
merge.summary::
@@ -654,7 +654,7 @@ merge.summary::
654
655
merge.tool::
656
Controls which merge resolution program is used by
657
- gitlink:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff",
657
+ linkgit:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff",
658
"meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
659
660
merge.verbosity::
@@ -667,31 +667,31 @@ merge.verbosity::
667
668
merge.<driver>.name::
669
Defines a human readable name for a custom low-level
670
- merge driver. See gitlink:gitattributes[5] for details.
670
+ merge driver. See linkgit:gitattributes[5] for details.
671
672
merge.<driver>.driver::
673
Defines the command that implements a custom low-level
674
- merge driver. See gitlink:gitattributes[5] for details.
674
+ merge driver. See linkgit:gitattributes[5] for details.
675
676
merge.<driver>.recursive::
677
Names a low-level merge driver to be used when
678
performing an internal merge between common ancestors.
679
- See gitlink:gitattributes[5] for details.
679
+ See linkgit:gitattributes[5] for details.
680
681
mergetool.<tool>.path::
682
Override the path for the given tool. This is useful in case
683
your tool is not in the PATH.
684
685
pack.window::
686
- The size of the window used by gitlink:git-pack-objects[1] when no
686
+ The size of the window used by linkgit:git-pack-objects[1] when no
687
window size is given on the command line. Defaults to 10.
688
689
pack.depth::
690
- The maximum delta depth used by gitlink:git-pack-objects[1] when no
690
+ The maximum delta depth used by linkgit:git-pack-objects[1] when no
691
maximum depth is given on the command line. Defaults to 50.
692
693
pack.windowMemory::
694
- The window memory size limit used by gitlink:git-pack-objects[1]
694
+ The window memory size limit used by linkgit:git-pack-objects[1]
695
when no limit is given on the command line. The value can be
696
suffixed with "k", "m", or "g". Defaults to 0, meaning no
697
limit.
@@ -707,16 +707,16 @@ pack.compression::
707
708
pack.deltaCacheSize::
709
The maximum memory in bytes used for caching deltas in
710
- gitlink:git-pack-objects[1].
710
+ linkgit:git-pack-objects[1].
711
A value of 0 means no limit. Defaults to 0.
712
713
pack.deltaCacheLimit::
714
The maximum size of a delta, that is cached in
715
- gitlink:git-pack-objects[1]. Defaults to 1000.
715
+ linkgit:git-pack-objects[1]. Defaults to 1000.
716
717
pack.threads::
718
Specifies the number of threads to spawn when searching for best
719
- delta matches. This requires that gitlink:git-pack-objects[1]
719
+ delta matches. This requires that linkgit:git-pack-objects[1]
720
be compiled with pthreads otherwise this option is ignored with a
721
warning. This is meant to reduce packing time on multiprocessor
722
machines. The required amount of memory for the delta search window
@@ -739,8 +739,8 @@ pull.twohead::
739
The default merge strategy to use when pulling a single branch.
740
741
remote.<name>.url::
742
- The URL of a remote repository. See gitlink:git-fetch[1] or
743
- gitlink:git-push[1].
742
+ The URL of a remote repository. See linkgit:git-fetch[1] or
743
+ linkgit:git-push[1].
744
745
remote.<name>.proxy::
746
For remotes that require curl (http, https and ftp), the URL to
@@ -748,24 +748,24 @@ remote.<name>.proxy::
748
disable proxying for that remote.
749
750
remote.<name>.fetch::
751
- The default set of "refspec" for gitlink:git-fetch[1]. See
752
- gitlink:git-fetch[1].
751
+ The default set of "refspec" for linkgit:git-fetch[1]. See
752
+ linkgit:git-fetch[1].
753
754
remote.<name>.push::
755
- The default set of "refspec" for gitlink:git-push[1]. See
756
- gitlink:git-push[1].
755
+ The default set of "refspec" for linkgit:git-push[1]. See
756
+ linkgit:git-push[1].
757
758
remote.<name>.skipDefaultUpdate::
759
If true, this remote will be skipped by default when updating
760
- using the update subcommand of gitlink:git-remote[1].
760
+ using the update subcommand of linkgit:git-remote[1].
761
762
remote.<name>.receivepack::
763
The default program to execute on the remote side when pushing. See
764
- option \--exec of gitlink:git-push[1].
764
+ option \--exec of linkgit:git-push[1].
765
766
remote.<name>.uploadpack::
767
The default program to execute on the remote side when fetching. See
768
- option \--exec of gitlink:git-fetch-pack[1].
768
+ option \--exec of linkgit:git-fetch-pack[1].
769
770
remote.<name>.tagopt::
771
Setting this value to --no-tags disables automatic tag following when fetching
@@ -773,22 +773,22 @@ remote.<name>.tagopt::
773
774
remotes.<group>::
775
The list of remotes which are fetched by "git remote update
776
- <group>". See gitlink:git-remote[1].
776
+ <group>". See linkgit:git-remote[1].
777
778
repack.usedeltabaseoffset::
779
- Allow gitlink:git-repack[1] to create packs that uses
779
+ Allow linkgit:git-repack[1] to create packs that uses
780
delta-base offset. Defaults to false.
781
782
show.difftree::
783
- The default gitlink:git-diff-tree[1] arguments to be used
784
- for gitlink:git-show[1].
783
+ The default linkgit:git-diff-tree[1] arguments to be used
784
+ for linkgit:git-show[1].
785
786
showbranch.default::
787
- The default set of branches for gitlink:git-show-branch[1].
788
- See gitlink:git-show-branch[1].
787
+ The default set of branches for linkgit:git-show-branch[1].
788
+ See linkgit:git-show-branch[1].
789
790
status.relativePaths::
791
- By default, gitlink:git-status[1] shows paths relative to the
791
+ By default, linkgit:git-status[1] shows paths relative to the
792
current directory. Setting this variable to `false` shows paths
793
relative to the repository root (this was the default for git
794
prior to v1.5.4).
@@ -798,32 +798,32 @@ tar.umask::
798
tar archive entries. The default is 0002, which turns off the
799
world write bit. The special value "user" indicates that the
800
archiving user's umask will be used instead. See umask(2) and
801
- gitlink:git-archive[1].
801
+ linkgit:git-archive[1].
802
803
user.email::
804
Your email address to be recorded in any newly created commits.
805
Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
806
- 'EMAIL' environment variables. See gitlink:git-commit-tree[1].
806
+ 'EMAIL' environment variables. See linkgit:git-commit-tree[1].
807
808
user.name::
809
Your full name to be recorded in any newly created commits.
810
Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
811
- environment variables. See gitlink:git-commit-tree[1].
811
+ environment variables. See linkgit:git-commit-tree[1].
812
813
user.signingkey::
814
- If gitlink:git-tag[1] is not selecting the key you want it to
814
+ If linkgit:git-tag[1] is not selecting the key you want it to
815
automatically when creating a signed tag, you can override the
816
default selection with this variable. This option is passed
817
unchanged to gpg's --local-user parameter, so you may specify a key
818
using any method that gpg supports.
819
820
whatchanged.difftree::
821
- The default gitlink:git-diff-tree[1] arguments to be used
822
- for gitlink:git-whatchanged[1].
821
+ The default linkgit:git-diff-tree[1] arguments to be used
822
+ for linkgit:git-whatchanged[1].
823
824
imap::
825
The configuration variables in the 'imap' section are described
826
- in gitlink:git-imap-send[1].
826
+ in linkgit:git-imap-send[1].
827
828
receive.unpackLimit::
829
If the number of objects received in a push is below this
Documentation/cvs-migration.txt
+5
-5
@@ -36,12 +36,12 @@ them first before running git pull.
36
================================
37
The `pull` command knows where to get updates from because of certain
38
configuration variables that were set by the first `git clone`
39
-command; see `git config -l` and the gitlink:git-config[1] man
39
+command; see `git config -l` and the linkgit:git-config[1] man
40
page for details.
41
================================
42
43
You can update the shared repository with your changes by first committing
44
-your changes, and then using the gitlink:git-push[1] command:
44
+your changes, and then using the linkgit:git-push[1] command:
45
46
------------------------------------------------
47
$ git push origin master
@@ -88,7 +88,7 @@ Next, give every team member read/write access to this repository. One
88
easy way to do this is to give all the team members ssh access to the
89
machine where the repository is hosted. If you don't want to give them a
90
full shell on the machine, there is a restricted shell which only allows
91
-users to do git pushes and pulls; see gitlink:git-shell[1].
91
+users to do git pushes and pulls; see linkgit:git-shell[1].
92
93
Put all the committers in the same group, and make the repository
94
writable by that group:
@@ -106,7 +106,7 @@ Importing a CVS archive
106
First, install version 2.1 or higher of cvsps from
107
link:http://www.cobite.com/cvsps/[http://www.cobite.com/cvsps/] and make
108
sure it is in your path. Then cd to a checked out CVS working directory
109
-of the project you are interested in and run gitlink:git-cvsimport[1]:
109
+of the project you are interested in and run linkgit:git-cvsimport[1]:
110
111
-------------------------------------------
112
$ git cvsimport -C <destination> <module>
@@ -146,7 +146,7 @@ Providing CVS Access to a git Repository
146
----------------------------------------
147
148
It is also possible to provide true CVS access to a git repository, so
149
-that developers can still use CVS; see gitlink:git-cvsserver[1] for
149
+that developers can still use CVS; see linkgit:git-cvsserver[1] for
150
details.
151
152
Alternative Development Models
Documentation/diff-options.txt
+2
-2
@@ -205,8 +205,8 @@ endif::git-format-patch[]
205
206
--ext-diff::
207
Allow an external diff helper to be executed. If you set an
208
- external diff driver with gitlink:gitattributes[5], you need
209
- to use this option with gitlink:git-log[1] and friends.
208
+ external diff driver with linkgit:gitattributes[5], you need
209
+ to use this option with linkgit:git-log[1] and friends.
210
211
--no-ext-diff::
212
Disallow external diff drivers.
Documentation/everyday.txt
+24
-24
@@ -25,12 +25,12 @@ Basic Repository[[Basic Repository]]
25
26
Everybody uses these commands to maintain git repositories.
27
28
- * gitlink:git-init[1] or gitlink:git-clone[1] to create a
28
+ * linkgit:git-init[1] or linkgit:git-clone[1] to create a
29
new repository.
30
31
- * gitlink:git-fsck[1] to check the repository for errors.
31
+ * linkgit:git-fsck[1] to check the repository for errors.
32
33
- * gitlink:git-gc[1] to do common housekeeping tasks such as
33
+ * linkgit:git-gc[1] to do common housekeeping tasks such as
34
repack and prune.
35
36
Examples
@@ -69,28 +69,28 @@ A standalone individual developer does not exchange patches with
69
other people, and works alone in a single repository, using the
70
following commands.
71
72
- * gitlink:git-show-branch[1] to see where you are.
72
+ * linkgit:git-show-branch[1] to see where you are.
73
74
- * gitlink:git-log[1] to see what happened.
74
+ * linkgit:git-log[1] to see what happened.
75
76
- * gitlink:git-checkout[1] and gitlink:git-branch[1] to switch
76
+ * linkgit:git-checkout[1] and linkgit:git-branch[1] to switch
77
branches.
78
79
- * gitlink:git-add[1] to manage the index file.
79
+ * linkgit:git-add[1] to manage the index file.
80
81
- * gitlink:git-diff[1] and gitlink:git-status[1] to see what
81
+ * linkgit:git-diff[1] and linkgit:git-status[1] to see what
82
you are in the middle of doing.
83
84
- * gitlink:git-commit[1] to advance the current branch.
84
+ * linkgit:git-commit[1] to advance the current branch.
85
86
- * gitlink:git-reset[1] and gitlink:git-checkout[1] (with
86
+ * linkgit:git-reset[1] and linkgit:git-checkout[1] (with
87
pathname parameters) to undo changes.
88
89
- * gitlink:git-merge[1] to merge between local branches.
89
+ * linkgit:git-merge[1] to merge between local branches.
90
91
- * gitlink:git-rebase[1] to maintain topic branches.
91
+ * linkgit:git-rebase[1] to maintain topic branches.
92
93
- * gitlink:git-tag[1] to mark known point.
93
+ * linkgit:git-tag[1] to mark known point.
94
95
Examples
96
~~~~~~~~
@@ -156,16 +156,16 @@ A developer working as a participant in a group project needs to
156
learn how to communicate with others, and uses these commands in
157
addition to the ones needed by a standalone developer.
158
159
- * gitlink:git-clone[1] from the upstream to prime your local
159
+ * linkgit:git-clone[1] from the upstream to prime your local
160
repository.
161
162
- * gitlink:git-pull[1] and gitlink:git-fetch[1] from "origin"
162
+ * linkgit:git-pull[1] and linkgit:git-fetch[1] from "origin"
163
to keep up-to-date with the upstream.
164
165
- * gitlink:git-push[1] to shared repository, if you adopt CVS
165
+ * linkgit:git-push[1] to shared repository, if you adopt CVS
166
style shared repository workflow.
167
168
- * gitlink:git-format-patch[1] to prepare e-mail submission, if
168
+ * linkgit:git-format-patch[1] to prepare e-mail submission, if
169
you adopt Linux kernel-style public forum workflow.
170
171
Examples
@@ -258,17 +258,17 @@ project receives changes made by others, reviews and integrates
258
them and publishes the result for others to use, using these
259
commands in addition to the ones needed by participants.
260
261
- * gitlink:git-am[1] to apply patches e-mailed in from your
261
+ * linkgit:git-am[1] to apply patches e-mailed in from your
262
contributors.
263
264
- * gitlink:git-pull[1] to merge from your trusted lieutenants.
264
+ * linkgit:git-pull[1] to merge from your trusted lieutenants.
265
266
- * gitlink:git-format-patch[1] to prepare and send suggested
266
+ * linkgit:git-format-patch[1] to prepare and send suggested
267
alternative to contributors.
268
269
- * gitlink:git-revert[1] to undo botched commits.
269
+ * linkgit:git-revert[1] to undo botched commits.
270
271
- * gitlink:git-push[1] to publish the bleeding edge.
271
+ * linkgit:git-push[1] to publish the bleeding edge.
272
273
274
Examples
@@ -343,10 +343,10 @@ Repository Administration[[Repository Administration]]
343
A repository administrator uses the following tools to set up
344
and maintain access to the repository by developers.
345
346
- * gitlink:git-daemon[1] to allow anonymous download from
346
+ * linkgit:git-daemon[1] to allow anonymous download from
347
repository.
348
349
- * gitlink:git-shell[1] can be used as a 'restricted login shell'
349
+ * linkgit:git-shell[1] can be used as a 'restricted login shell'
350
for shared central repository users.
351
352
link:howto/update-hook-example.txt[update hook howto] has a good
Documentation/fetch-options.txt
+1
-1
@@ -50,5 +50,5 @@
50
51
\--depth=<depth>::
52
Deepen the history of a 'shallow' repository created by
53
- `git clone` with `--depth=<depth>` option (see gitlink:git-clone[1])
53
+ `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
54
by the specified number of commits.
Documentation/git-add.txt
+8
-8
@@ -37,7 +37,7 @@ directory recursion or filename globbing performed by Git (quote your
37
globs before the shell) will be silently ignored. The 'add' command can
38
be used to add ignored files with the `-f` (force) option.
39
40
-Please see gitlink:git-commit[1] for alternative ways to add content to a
40
+Please see linkgit:git-commit[1] for alternative ways to add content to a
41
commit.
42
43
@@ -231,12 +231,12 @@ diff::
231
232
See Also
233
--------
234
-gitlink:git-status[1]
235
-gitlink:git-rm[1]
236
-gitlink:git-reset[1]
237
-gitlink:git-mv[1]
238
-gitlink:git-commit[1]
239
-gitlink:git-update-index[1]
234
+linkgit:git-status[1]
235
+linkgit:git-rm[1]
236
+linkgit:git-reset[1]
237
+linkgit:git-mv[1]
238
+linkgit:git-commit[1]
239
+linkgit:git-update-index[1]
240
241
Author
242
------
@@ -248,4 +248,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
248
249
GIT
250
---
251
-Part of the gitlink:git[7] suite
251
+Part of the linkgit:git[7] suite
Documentation/git-am.txt
+8
-8
@@ -37,10 +37,10 @@ OPTIONS
37
area to store extracted patches.
38
39
-k, --keep::
40
- Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
40
+ Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
41
42
-u, --utf8::
43
- Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
43
+ Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
44
The proposed commit log message taken from the e-mail
45
is re-coded into UTF-8 encoding (configuration variable
46
`i18n.commitencoding` can be used to specify project's
@@ -51,7 +51,7 @@ default. You could use `--no-utf8` to override this.
51
52
--no-utf8::
53
Pass `-n` flag to `git-mailinfo` (see
54
- gitlink:git-mailinfo[1]).
54
+ linkgit:git-mailinfo[1]).
55
56
-3, --3way::
57
When the patch does not apply cleanly, fall back on
@@ -61,15 +61,15 @@ default. You could use `--no-utf8` to override this.
61
62
-b, --binary::
63
Pass `--allow-binary-replacement` flag to `git-apply`
64
- (see gitlink:git-apply[1]).
64
+ (see linkgit:git-apply[1]).
65
66
--whitespace=<option>::
67
- This flag is passed to the `git-apply` (see gitlink:git-apply[1])
67
+ This flag is passed to the `git-apply` (see linkgit:git-apply[1])
68
program that applies
69
the patch.
70
71
-C<n>, -p<n>::
72
- These flags are passed to the `git-apply` (see gitlink:git-apply[1])
72
+ These flags are passed to the `git-apply` (see linkgit:git-apply[1])
73
program that applies
74
the patch.
75
@@ -144,7 +144,7 @@ names.
144
145
SEE ALSO
146
--------
147
-gitlink:git-apply[1].
147
+linkgit:git-apply[1].
148
149
150
Author
@@ -157,4 +157,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
157
158
GIT
159
---
160
-Part of the gitlink:git[7] suite
160
+Part of the linkgit:git[7] suite
Documentation/git-annotate.txt
+2
-2
@@ -20,7 +20,7 @@ include::blame-options.txt[]
20
21
SEE ALSO
22
--------
23
-gitlink:git-blame[1]
23
+linkgit:git-blame[1]
24
25
AUTHOR
26
------
@@ -28,4 +28,4 @@ Written by Ryan Anderson <ryan@michonline.com>.
28
29
GIT
30
---
31
-Part of the gitlink:git[7] suite
31
+Part of the linkgit:git[7] suite
Documentation/git-apply.txt
+6
-6
@@ -77,7 +77,7 @@ the information is read from the current index instead.
77
Apply the patch in reverse.
78
79
--reject::
80
- For atomicity, gitlink:git-apply[1] by default fails the whole patch and
80
+ For atomicity, linkgit:git-apply[1] by default fails the whole patch and
81
does not touch the working tree when some of the hunks
82
do not apply. This option makes it apply
83
the parts of the patch that are applicable, and leave the
@@ -101,7 +101,7 @@ the information is read from the current index instead.
101
ever ignored.
102
103
--unidiff-zero::
104
- By default, gitlink:git-apply[1] expects that the patch being
104
+ By default, linkgit:git-apply[1] expects that the patch being
105
applied is a unified diff with at least one line of context.
106
This provides good safety measures, but breaks down when
107
applying a diff generated with --unified=0. To bypass these
@@ -112,7 +112,7 @@ discouraged.
112
113
--apply::
114
If you use any of the options marked "Turns off
115
- 'apply'" above, gitlink:git-apply[1] reads and outputs the
115
+ 'apply'" above, linkgit:git-apply[1] reads and outputs the
116
information you asked without actually applying the
117
patch. Give this flag after those flags to also apply
118
the patch.
@@ -145,7 +145,7 @@ discouraged.
145
considered whitespace errors.
146
+
147
By default, the command outputs warning messages but applies the patch.
148
-When gitlink:git-apply[1] is used for statistics and not applying a
148
+When linkgit:git-apply[1] is used for statistics and not applying a
149
patch, it defaults to `nowarn`.
150
+
151
You can use different `<action>` to control this
@@ -183,7 +183,7 @@ apply.whitespace::
183
184
Submodules
185
----------
186
-If the patch contains any changes to submodules then gitlink:git-apply[1]
186
+If the patch contains any changes to submodules then linkgit:git-apply[1]
187
treats these changes as follows.
188
189
If --index is specified (explicitly or implicitly), then the submodule
@@ -206,4 +206,4 @@ Documentation by Junio C Hamano
206
207
GIT
208
---
209
-Part of the gitlink:git[7] suite
209
+Part of the linkgit:git[7] suite
Documentation/git-archimport.txt
+1
-1
@@ -117,4 +117,4 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kern
117
118
GIT
119
---
120
-Part of the gitlink:git[7] suite
120
+Part of the linkgit:git[7] suite
Documentation/git-archive.txt
+1
-1
@@ -118,4 +118,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
118
119
GIT
120
---
121
-Part of the gitlink:git[7] suite
121
+Part of the linkgit:git[7] suite
Documentation/git-bisect.txt
+1
-1
@@ -227,4 +227,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
227
228
GIT
229
---
230
-Part of the gitlink:git[7] suite
230
+Part of the linkgit:git[7] suite
Documentation/git-blame.txt
+4
-4
@@ -21,7 +21,7 @@ last modified the line. Optionally, start annotating from the given revision.
21
Also it can limit the range of lines annotated.
22
23
This report doesn't tell you anything about lines which have been deleted or
24
-replaced; you need to use a tool such as gitlink:git-diff[1] or the "pickaxe"
24
+replaced; you need to use a tool such as linkgit:git-diff[1] or the "pickaxe"
25
interface briefly mentioned in the following paragraph.
26
27
Apart from supporting file annotation, git also supports searching the
@@ -41,7 +41,7 @@ OPTIONS
41
include::blame-options.txt[]
42
43
-c::
44
- Use the same output mode as gitlink:git-annotate[1] (Default: off).
44
+ Use the same output mode as linkgit:git-annotate[1] (Default: off).
45
46
--score-debug::
47
Include debugging information related to the movement of
@@ -184,7 +184,7 @@ commit commentary), a blame viewer won't ever care.
184
185
SEE ALSO
186
--------
187
-gitlink:git-annotate[1]
187
+linkgit:git-annotate[1]
188
189
AUTHOR
190
------
@@ -192,4 +192,4 @@ Written by Junio C Hamano <junkio@cox.net>
192
193
GIT
194
---
195
-Part of the gitlink:git[7] suite
195
+Part of the linkgit:git[7] suite
Documentation/git-branch.txt
+6
-6
@@ -35,7 +35,7 @@ working tree to it; use "git checkout <newbranch>" to switch to the
35
new branch.
36
37
When a local branch is started off a remote branch, git can setup the
38
-branch so that gitlink:git-pull[1] will appropriately merge from that
38
+branch so that linkgit:git-pull[1] will appropriately merge from that
39
remote branch. If this behavior is desired, it is possible to make it
40
the default using the global `branch.autosetupmerge` configuration
41
flag. Otherwise, it can be chosen per-branch using the `--track`
@@ -53,8 +53,8 @@ has a reflog then the reflog will also be deleted.
53
54
Use -r together with -d to delete remote-tracking branches. Note, that it
55
only makes sense to delete remote-tracking branches if they no longer exist
56
-in remote repository or if gitlink:git-fetch[1] was configured not to fetch
57
-them again. See also 'prune' subcommand of gitlink:git-remote[1] for way to
56
+in remote repository or if linkgit:git-fetch[1] was configured not to fetch
57
+them again. See also 'prune' subcommand of linkgit:git-remote[1] for way to
58
clean up all obsolete remote-tracking branches.
59
60
@@ -122,7 +122,7 @@ OPTIONS
122
<branchname>::
123
The name of the branch to create or delete.
124
The new branch name must pass all checks defined by
125
- gitlink:git-check-ref-format[1]. Some of these checks
125
+ linkgit:git-check-ref-format[1]. Some of these checks
126
may restrict the characters allowed in a branch name.
127
128
<start-point>::
@@ -164,7 +164,7 @@ $ git branch -D test <2>
164
+
165
<1> Delete remote-tracking branches "todo", "html", "man". Next 'fetch' or
166
'pull' will create them again unless you configure them not to. See
167
-gitlink:git-fetch[1].
167
+linkgit:git-fetch[1].
168
<2> Delete "test" branch even if the "master" branch (or whichever branch is
169
currently checked out) does not have all commits from test branch.
170
@@ -187,4 +187,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
187
188
GIT
189
---
190
-Part of the gitlink:git[7] suite
190
+Part of the linkgit:git[7] suite
Documentation/git-bundle.txt
+5
-5
@@ -23,7 +23,7 @@ be directly connected so the interactive git protocols (git, ssh,
23
rsync, http) cannot be used. This command provides support for
24
git-fetch and git-pull to operate by packaging objects and references
25
in an archive at the originating machine, then importing those into
26
-another repository using gitlink:git-fetch[1] and gitlink:git-pull[1]
26
+another repository using linkgit:git-fetch[1] and linkgit:git-pull[1]
27
after moving the archive by some means (i.e., by sneakernet). As no
28
direct connection between repositories exists, the user must specify a
29
basis for the bundle that is held by the destination repository: the
@@ -51,12 +51,12 @@ list-heads <file>::
51
printed out.
52
53
unbundle <file>::
54
- Passes the objects in the bundle to gitlink:git-index-pack[1]
54
+ Passes the objects in the bundle to linkgit:git-index-pack[1]
55
for storage in the repository, then prints the names of all
56
defined references. If a reflist is given, only references
57
matching those in the given list are printed. This command is
58
really plumbing, intended to be called only by
59
- gitlink:git-fetch[1].
59
+ linkgit:git-fetch[1].
60
61
[git-rev-list-args...]::
62
A list of arguments, acceptable to git-rev-parse and
@@ -73,7 +73,7 @@ unbundle <file>::
73
available. This is principally of use to git-fetch, which
74
expects to receive only those references asked for and not
75
necessarily everything in the pack (in this case, git-bundle is
76
- acting like gitlink:git-fetch-pack[1]).
76
+ acting like linkgit:git-fetch-pack[1]).
77
78
SPECIFYING REFERENCES
79
---------------------
@@ -145,4 +145,4 @@ Written by Mark Levedahl <mdl123@verizon.net>
145
146
GIT
147
---
148
-Part of the gitlink:git[7] suite
148
+Part of the linkgit:git[7] suite
Documentation/git-cat-file.txt
+2
-2
@@ -21,7 +21,7 @@ OPTIONS
21
<object>::
22
The name of the object to show.
23
For a more complete list of ways to spell object names, see
24
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
24
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
25
26
-t::
27
Instead of the content, show the object type identified by
@@ -70,4 +70,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
70
71
GIT
72
---
73
-Part of the gitlink:git[7] suite
73
+Part of the linkgit:git[7] suite
Documentation/git-check-attr.txt
+2
-2
@@ -25,7 +25,7 @@ OPTIONS
25
26
SEE ALSO
27
--------
28
-gitlink:gitattributes[5].
28
+linkgit:gitattributes[5].
29
30
31
Author
@@ -38,4 +38,4 @@ Documentation by James Bowes.
38
39
GIT
40
---
41
-Part of the gitlink:git[7] suite
41
+Part of the linkgit:git[7] suite
Documentation/git-check-ref-format.txt
+3
-3
@@ -35,7 +35,7 @@ imposes the following rules on how refs are named:
35
These rules makes it easy for shell script based tools to parse
36
refnames, pathname expansion by the shell when a refname is used
37
unquoted (by mistake), and also avoids ambiguities in certain
38
-refname expressions (see gitlink:git-rev-parse[1]). Namely:
38
+refname expressions (see linkgit:git-rev-parse[1]). Namely:
39
40
. double-dot `..` are often used as in `ref1..ref2`, and in some
41
context this notation means `{caret}ref1 ref2` (i.e. not in
@@ -47,9 +47,9 @@ refname expressions (see gitlink:git-rev-parse[1]). Namely:
47
. colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
48
value and store it in dstref" in fetch and push operations.
49
It may also be used to select a specific object such as with
50
- gitlink:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".
50
+ linkgit:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".
51
52
53
GIT
54
---
55
-Part of the gitlink:git[7] suite
55
+Part of the linkgit:git[7] suite
Documentation/git-checkout-index.txt
+1
-1
@@ -181,4 +181,4 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
181
182
GIT
183
---
184
-Part of the gitlink:git[7] suite
184
+Part of the linkgit:git[7] suite
Documentation/git-checkout.txt
+2
-2
@@ -44,7 +44,7 @@ OPTIONS
44
-b::
45
Create a new branch named <new_branch> and start it at
46
<branch>. The new branch name must pass all checks defined
47
- by gitlink:git-check-ref-format[1]. Some of these checks
47
+ by linkgit:git-check-ref-format[1]. Some of these checks
48
may restrict the characters allowed in a branch name.
49
50
--track::
@@ -216,4 +216,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
216
217
GIT
218
---
219
-Part of the gitlink:git[7] suite
219
+Part of the linkgit:git[7] suite
Documentation/git-cherry-pick.txt
+2
-2
@@ -20,7 +20,7 @@ OPTIONS
20
<commit>::
21
Commit to cherry-pick.
22
For a more complete list of ways to spell commits, see
23
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
23
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
24
25
-e|--edit::
26
With this option, `git-cherry-pick` will let you edit the commit
@@ -75,4 +75,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
75
76
GIT
77
---
78
-Part of the gitlink:git[7] suite
78
+Part of the linkgit:git[7] suite
Documentation/git-cherry.txt
+1
-1
@@ -66,4 +66,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
66
67
GIT
68
---
69
-Part of the gitlink:git[7] suite
69
+Part of the linkgit:git[7] suite
Documentation/git-citool.txt
+3
-3
@@ -14,10 +14,10 @@ DESCRIPTION
14
A Tcl/Tk based graphical interface to review modified files, stage
15
them into the index, enter a commit message and record the new
16
commit onto the current branch. This interface is an alternative
17
-to the less interactive gitlink:git-commit[1] program.
17
+to the less interactive linkgit:git-commit[1] program.
18
19
git-citool is actually a standard alias for 'git gui citool'.
20
-See gitlink:git-gui[1] for more details.
20
+See linkgit:git-gui[1] for more details.
21
22
Author
23
------
@@ -29,4 +29,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
29
30
GIT
31
---
32
-Part of the gitlink:git[7] suite
32
+Part of the linkgit:git[7] suite
Documentation/git-clean.txt
+2
-2
@@ -39,7 +39,7 @@ OPTIONS
39
-x::
40
Don't use the ignore rules. This allows removing all untracked
41
files, including build products. This can be used (possibly in
42
- conjunction with gitlink:git-reset[1]) to create a pristine
42
+ conjunction with linkgit:git-reset[1]) to create a pristine
43
working directory to test a clean build.
44
45
-X::
@@ -54,4 +54,4 @@ Written by Pavel Roskin <proski@gnu.org>
54
55
GIT
56
---
57
-Part of the gitlink:git[7] suite
57
+Part of the linkgit:git[7] suite
Documentation/git-clone.txt
+1
-1
@@ -191,4 +191,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
191
192
GIT
193
---
194
-Part of the gitlink:git[7] suite
194
+Part of the linkgit:git[7] suite
Documentation/git-commit-tree.txt
+3
-3
@@ -13,7 +13,7 @@ SYNOPSIS
13
DESCRIPTION
14
-----------
15
This is usually not what an end user wants to run directly. See
16
-gitlink:git-commit[1] instead.
16
+linkgit:git-commit[1] instead.
17
18
Creates a new commit object based on the provided tree object and
19
emits the new commit object id on stdout. If no parent is given then
@@ -90,7 +90,7 @@ include::i18n.txt[]
90
91
See Also
92
--------
93
-gitlink:git-write-tree[1]
93
+linkgit:git-write-tree[1]
94
95
96
Author
@@ -103,4 +103,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
103
104
GIT
105
---
106
-Part of the gitlink:git[7] suite
106
+Part of the linkgit:git[7] suite
Documentation/git-commit.txt
+15
-15
@@ -20,11 +20,11 @@ commit along with a log message describing the changes you have made.
20
21
The content to be added can be specified in several ways:
22
23
-1. by using gitlink:git-add[1] to incrementally "add" changes to the
23
+1. by using linkgit:git-add[1] to incrementally "add" changes to the
24
index before using the 'commit' command (Note: even modified
25
files must be "added");
26
27
-2. by using gitlink:git-rm[1] to remove files from the working tree
27
+2. by using linkgit:git-rm[1] to remove files from the working tree
28
and the index, again before using the 'commit' command;
29
30
3. by listing files as arguments to the 'commit' command, in which
@@ -41,13 +41,13 @@ The content to be added can be specified in several ways:
41
by one which files should be part of the commit, before finalizing the
42
operation. Currently, this is done by invoking `git-add --interactive`.
43
44
-The gitlink:git-status[1] command can be used to obtain a
44
+The linkgit:git-status[1] command can be used to obtain a
45
summary of what is included by any of the above for the next
46
commit by giving the same set of parameters you would give to
47
this command.
48
49
If you make a commit and then found a mistake immediately after
50
-that, you can recover from it with gitlink:git-reset[1].
50
+that, you can recover from it with linkgit:git-reset[1].
51
52
53
OPTIONS
@@ -170,7 +170,7 @@ EXAMPLES
170
--------
171
When recording your own work, the contents of modified files in
172
your working tree are temporarily stored to a staging area
173
-called the "index" with gitlink:git-add[1]. A file can be
173
+called the "index" with linkgit:git-add[1]. A file can be
174
reverted back, only in the index but not in the working tree,
175
to that of the last commit with `git-reset HEAD -- <file>`,
176
which effectively reverts `git-add` and prevents the changes to
@@ -229,13 +229,13 @@ $ git commit
229
this second commit would record the changes to `hello.c` and
230
`hello.h` as expected.
231
232
-After a merge (initiated by either gitlink:git-merge[1] or
233
-gitlink:git-pull[1]) stops because of conflicts, cleanly merged
232
+After a merge (initiated by either linkgit:git-merge[1] or
233
+linkgit:git-pull[1]) stops because of conflicts, cleanly merged
234
paths are already staged to be committed for you, and paths that
235
conflicted are left in unmerged state. You would have to first
236
-check which paths are conflicting with gitlink:git-status[1]
236
+check which paths are conflicting with linkgit:git-status[1]
237
and after fixing them manually in your working tree, you would
238
-stage the result as usual with gitlink:git-add[1]:
238
+stage the result as usual with linkgit:git-add[1]:
239
240
------------
241
$ git status | grep unmerged
@@ -287,11 +287,11 @@ information.
287
288
SEE ALSO
289
--------
290
-gitlink:git-add[1],
291
-gitlink:git-rm[1],
292
-gitlink:git-mv[1],
293
-gitlink:git-merge[1],
294
-gitlink:git-commit-tree[1]
290
+linkgit:git-add[1],
291
+linkgit:git-rm[1],
292
+linkgit:git-mv[1],
293
+linkgit:git-merge[1],
294
+linkgit:git-commit-tree[1]
295
296
Author
297
------
@@ -301,4 +301,4 @@ Junio C Hamano <junkio@cox.net>
301
302
GIT
303
---
304
-Part of the gitlink:git[7] suite
304
+Part of the linkgit:git[7] suite
Documentation/git-config.txt
+1
-1
@@ -332,4 +332,4 @@ Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.ker
332
333
GIT
334
---
335
-Part of the gitlink:git[7] suite
335
+Part of the linkgit:git[7] suite
Documentation/git-count-objects.txt
+1
-1
@@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
34
35
GIT
36
---
37
-Part of the gitlink:git[7] suite
37
+Part of the linkgit:git[7] suite
Documentation/git-cvsexportcommit.txt
+1
-1
@@ -106,4 +106,4 @@ Documentation by Martin Langhoff <martin@catalyst.net.nz> and others.
106
107
GIT
108
---
109
-Part of the gitlink:git[7] suite
109
+Part of the linkgit:git[7] suite
Documentation/git-cvsimport.txt
+2
-2
@@ -142,7 +142,7 @@ file each time git-cvsimport is run.
142
+
143
It is not recommended to use this feature if you intend to
144
export changes back to CVS again later with
145
-gitlink:git-cvsexportcommit[1].
145
+linkgit:git-cvsexportcommit[1].
146
147
-h::
148
Print a short usage message and exit.
@@ -166,4 +166,4 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
166
167
GIT
168
---
169
-Part of the gitlink:git[7] suite
169
+Part of the linkgit:git[7] suite
Documentation/git-cvsserver.txt
+2
-2
@@ -28,7 +28,7 @@ OPTIONS
28
-------
29
30
All these options obviously only make sense if enforced by the server side.
31
-They have been implemented to resemble the gitlink:git-daemon[1] options as
31
+They have been implemented to resemble the linkgit:git-daemon[1] options as
32
closely as possible.
33
34
--base-path <path>::
@@ -319,4 +319,4 @@ Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@
319
320
GIT
321
---
322
-Part of the gitlink:git[7] suite
322
+Part of the linkgit:git[7] suite
Documentation/git-daemon.txt
+1
-1
@@ -272,4 +272,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
272
273
GIT
274
---
275
-Part of the gitlink:git[7] suite
275
+Part of the linkgit:git[7] suite
Documentation/git-describe.txt
+1
-1
@@ -123,4 +123,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
123
124
GIT
125
---
126
-Part of the gitlink:git[7] suite
126
+Part of the linkgit:git[7] suite
Documentation/git-diff-files.txt
+1
-1
@@ -57,4 +57,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
57
58
GIT
59
---
60
-Part of the gitlink:git[7] suite
60
+Part of the linkgit:git[7] suite
Documentation/git-diff-index.txt
+1
-1
@@ -129,4 +129,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
129
130
GIT
131
---
132
-Part of the gitlink:git[7] suite
132
+Part of the linkgit:git[7] suite
Documentation/git-diff-tree.txt
+1
-1
@@ -165,4 +165,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
165
166
GIT
167
---
168
-Part of the gitlink:git[7] suite
168
+Part of the linkgit:git[7] suite
Documentation/git-diff.txt
+4
-4
@@ -21,7 +21,7 @@ tree and the index file, or the index file and the working tree.
21
the index (staging area for the next commit). In other
22
words, the differences are what you _could_ tell git to
23
further add to the index but you still haven't. You can
24
- stage these changes by using gitlink:git-add[1].
24
+ stage these changes by using linkgit:git-add[1].
25
+
26
If exactly two paths are given, and at least one is untracked,
27
compare the two files / directories. This behavior can be
@@ -67,11 +67,11 @@ for the last two forms that use ".." notations, can be any
67
<tree-ish>.
68
69
For a more complete list of ways to spell <commit>, see
70
-"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
70
+"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
71
However, "diff" is about comparing two _endpoints_, not ranges,
72
and the range notations ("<commit>..<commit>" and
73
"<commit>\...<commit>") do not mean a range as defined in the
74
-"SPECIFYING RANGES" section in gitlink:git-rev-parse[1].
74
+"SPECIFYING RANGES" section in linkgit:git-rev-parse[1].
75
76
OPTIONS
77
-------
@@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
168
169
GIT
170
---
171
-Part of the gitlink:git[7] suite
171
+Part of the linkgit:git[7] suite
Documentation/git-fast-export.txt
+6
-6
@@ -13,18 +13,18 @@ SYNOPSIS
13
DESCRIPTION
14
-----------
15
This program dumps the given revisions in a form suitable to be piped
16
-into gitlink:git-fast-import[1].
16
+into linkgit:git-fast-import[1].
17
18
You can use it as a human readable bundle replacement (see
19
-gitlink:git-bundle[1]), or as a kind of an interactive
20
-gitlink:git-filter-branch[1].
19
+linkgit:git-bundle[1]), or as a kind of an interactive
20
+linkgit:git-filter-branch[1].
21
22
23
OPTIONS
24
-------
25
--progress=<n>::
26
Insert 'progress' statements every <n> objects, to be shown by
27
- gitlink:git-fast-import[1] during import.
27
+ linkgit:git-fast-import[1] during import.
28
29
--signed-tags=(verbatim|warn|strip|abort)::
30
Specify how to handle signed tags. Since any transformation
@@ -65,7 +65,7 @@ referenced by that revision range contains the string
65
Limitations
66
-----------
67
68
-Since gitlink:git-fast-import[1] cannot tag trees, you will not be
68
+Since linkgit:git-fast-import[1] cannot tag trees, you will not be
69
able to export the linux-2.6.git repository completely, as it contains
70
a tag referencing a tree instead of a commit.
71
@@ -80,4 +80,4 @@ Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
80
81
GIT
82
---
83
-Part of the gitlink:git[7] suite
83
+Part of the linkgit:git[7] suite
Documentation/git-fast-import.txt
+9
-9
@@ -24,7 +24,7 @@ updated branch and tag refs, fully updating the current repository
24
with the newly imported data.
25
26
The fast-import backend itself can import into an empty repository (one that
27
-has already been initialized by gitlink:git-init[1]) or incrementally
27
+has already been initialized by linkgit:git-init[1]) or incrementally
28
update an existing populated repository. Whether or not incremental
29
imports are supported from a particular foreign source depends on
30
the frontend program in use.
@@ -82,7 +82,7 @@ OPTIONS
82
This information may be useful after importing projects
83
whose total object set exceeds the 4 GiB packfile limit,
84
as these commits can be used as edge points during calls
85
- to gitlink:git-pack-objects[1].
85
+ to linkgit:git-pack-objects[1].
86
87
--quiet::
88
Disable all non-fatal output, making fast-import silent when it
@@ -220,7 +220,7 @@ variation in formatting will cause fast-import to reject the value.
220
+
221
An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git
222
parser is accurate, but a little on the lenient side. It is the
223
-same parser used by gitlink:git-am[1] when applying patches
223
+same parser used by linkgit:git-am[1] when applying patches
224
received from email.
225
+
226
Some malformed strings may be accepted as valid dates. In some of
@@ -256,7 +256,7 @@ timezone.
256
This particular format is supplied as its short to implement and
257
may be useful to a process that wants to create a new commit
258
right now, without needing to use a working directory or
259
-gitlink:git-update-index[1].
259
+linkgit:git-update-index[1].
260
+
261
If separate `author` and `committer` commands are used in a `commit`
262
the timestamps may not match, as the system clock will be polled
@@ -411,7 +411,7 @@ Marks must be declared (via `mark`) before they can be used.
411
* A complete 40 byte or abbreviated commit SHA-1 in hex.
412
413
* Any valid Git SHA-1 expression that resolves to a commit. See
414
- ``SPECIFYING REVISIONS'' in gitlink:git-rev-parse[1] for details.
414
+ ``SPECIFYING REVISIONS'' in linkgit:git-rev-parse[1] for details.
415
416
The special case of restarting an incremental import from the
417
current branch value should be written as:
@@ -649,7 +649,7 @@ recommended, as the frontend does not (easily) have access to the
649
complete set of bytes which normally goes into such a signature.
650
If signing is required, create lightweight tags from within fast-import with
651
`reset`, then create the annotated versions of those tags offline
652
-with the standard gitlink:git-tag[1] process.
652
+with the standard linkgit:git-tag[1] process.
653
654
`reset`
655
~~~~~~~
@@ -863,7 +863,7 @@ is not `refs/heads/TAG_FIXUP`).
863
864
When committing fixups, consider using `merge` to connect the
865
commit(s) which are supplying file revisions to the fixup branch.
866
-Doing so will allow tools such as gitlink:git-blame[1] to track
866
+Doing so will allow tools such as linkgit:git-blame[1] to track
867
through the real commit history and properly annotate the source
868
files.
869
@@ -892,7 +892,7 @@ Repacking Historical Data
892
~~~~~~~~~~~~~~~~~~~~~~~~~
893
If you are repacking very old imported data (e.g. older than the
894
last year), consider expending some extra CPU time and supplying
895
-\--window=50 (or higher) when you run gitlink:git-repack[1].
895
+\--window=50 (or higher) when you run linkgit:git-repack[1].
896
This will take longer, but will also produce a smaller packfile.
897
You only need to expend the effort once, and everyone using your
898
project will benefit from the smaller repository.
@@ -1027,4 +1027,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
1027
1028
GIT
1029
---
1030
-Part of the gitlink:git[7] suite
1030
+Part of the linkgit:git[7] suite
Documentation/git-fetch-pack.txt
+2
-2
@@ -12,7 +12,7 @@ SYNOPSIS
12
13
DESCRIPTION
14
-----------
15
-Usually you would want to use gitlink:git-fetch[1] which is a
15
+Usually you would want to use linkgit:git-fetch[1] which is a
16
higher level wrapper of this command instead.
17
18
Invokes 'git-upload-pack' on a potentially remote repository,
@@ -93,4 +93,4 @@ Documentation by Junio C Hamano.
93
94
GIT
95
---
96
-Part of the gitlink:git[7] suite
96
+Part of the linkgit:git[7] suite
Documentation/git-fetch.txt
+2
-2
@@ -39,7 +39,7 @@ include::urls-remotes.txt[]
39
40
SEE ALSO
41
--------
42
-gitlink:git-pull[1]
42
+linkgit:git-pull[1]
43
44
45
Author
@@ -53,4 +53,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
53
54
GIT
55
---
56
-Part of the gitlink:git[7] suite
56
+Part of the linkgit:git[7] suite
Documentation/git-filter-branch.txt
+8
-8
@@ -72,7 +72,7 @@ OPTIONS
72
This is the filter for modifying the environment in which
73
the commit will be performed. Specifically, you might want
74
to rewrite the author/committer name/email/time environment
75
- variables (see gitlink:git-commit[1] for details). Do not forget
75
+ variables (see linkgit:git-commit[1] for details). Do not forget
76
to re-export the variables.
77
78
--tree-filter <command>::
@@ -86,13 +86,13 @@ OPTIONS
86
--index-filter <command>::
87
This is the filter for rewriting the index. It is similar to the
88
tree filter but does not check out the tree, which makes it much
89
- faster. For hairy cases, see gitlink:git-update-index[1].
89
+ faster. For hairy cases, see linkgit:git-update-index[1].
90
91
--parent-filter <command>::
92
This is the filter for rewriting the commit's parent list.
93
It will receive the parent string on stdin and shall output
94
the new parent string on stdout. The parent string is in
95
- a format accepted by gitlink:git-commit-tree[1]: empty for
95
+ a format accepted by linkgit:git-commit-tree[1]: empty for
96
the initial commit, "-p parent" for a normal commit and
97
"-p parent1 -p parent2 -p parent3 ..." for a merge commit.
98
@@ -105,7 +105,7 @@ OPTIONS
105
--commit-filter <command>::
106
This is the filter for performing the commit.
107
If this filter is specified, it will be called instead of the
108
- gitlink:git-commit-tree[1] command, with arguments of the form
108
+ linkgit:git-commit-tree[1] command, with arguments of the form
109
"<TREE_ID> [-p <PARENT_COMMIT_ID>]..." and the log message on
110
stdin. The commit id is expected on stdout.
111
+
@@ -116,7 +116,7 @@ have all of them as parents.
116
You can use the 'map' convenience function in this filter, and other
117
convenience functions, too. For example, calling 'skip_commit "$@"'
118
will leave out the current commit (but not its changes! If you want
119
-that, use gitlink:git-rebase[1] instead).
119
+that, use linkgit:git-rebase[1] instead).
120
121
--tag-name-filter <command>::
122
This is the filter for rewriting tag names. When passed,
@@ -159,7 +159,7 @@ definition impossible to preserve signatures at any rate.)
159
160
<rev-list-options>::
161
When options are given after the new branch name, they will
162
- be passed to gitlink:git-rev-list[1]. Only commits in the resulting
162
+ be passed to linkgit:git-rev-list[1]. Only commits in the resulting
163
output will be filtered, although the filtered commits can still
164
reference parents which are outside of that set.
165
@@ -249,7 +249,7 @@ will print.
249
*NOTE* the changes introduced by the commits, and which are not reverted
250
by subsequent commits, will still be in the rewritten branch. If you want
251
to throw out _changes_ together with the commits, you should use the
252
-interactive mode of gitlink:git-rebase[1].
252
+interactive mode of linkgit:git-rebase[1].
253
254
255
Consider this history:
@@ -295,4 +295,4 @@ Documentation by Petr Baudis and the git list.
295
296
GIT
297
---
298
-Part of the gitlink:git[7] suite
298
+Part of the linkgit:git[7] suite
Documentation/git-fmt-merge-msg.txt
+2
-2
@@ -46,7 +46,7 @@ merge.summary::
46
47
SEE ALSO
48
--------
49
-gitlink:git-merge[1]
49
+linkgit:git-merge[1]
50
51
52
Author
@@ -59,4 +59,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
59
60
GIT
61
---
62
-Part of the gitlink:git[7] suite
62
+Part of the linkgit:git[7] suite
Documentation/git-format-patch.txt
+4
-4
@@ -25,7 +25,7 @@ DESCRIPTION
25
Prepare each commit with its patch in
26
one file per commit, formatted to resemble UNIX mailbox format.
27
The output of this command is convenient for e-mail submission or
28
-for use with gitlink:git-am[1].
28
+for use with linkgit:git-am[1].
29
30
There are two ways to specify which commits to operate on.
31
@@ -34,7 +34,7 @@ There are two ways to specify which commits to operate on.
34
that leads to the <since> to be output.
35
36
2. Generic <revision range> expression (see "SPECIFYING
37
- REVISIONS" section in gitlink:git-rev-parse[1]) means the
37
+ REVISIONS" section in linkgit:git-rev-parse[1]) means the
38
commits in the specified range.
39
40
A single commit, when interpreted as a <revision range>
@@ -192,7 +192,7 @@ git-format-patch -3::
192
193
See Also
194
--------
195
-gitlink:git-am[1], gitlink:git-send-email[1]
195
+linkgit:git-am[1], linkgit:git-send-email[1]
196
197
198
Author
@@ -205,4 +205,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
205
206
GIT
207
---
208
-Part of the gitlink:git[7] suite
208
+Part of the linkgit:git[7] suite
Documentation/git-fsck-objects.txt
+1
-1
@@ -13,5 +13,5 @@ SYNOPSIS
13
DESCRIPTION
14
-----------
15
16
-This is a synonym for gitlink:git-fsck[1]. Please refer to the
16
+This is a synonym for linkgit:git-fsck[1]. Please refer to the
17
documentation of that command.
Documentation/git-fsck.txt
+1
-1
@@ -150,4 +150,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
150
151
GIT
152
---
153
-Part of the gitlink:git[7] suite
153
+Part of the linkgit:git[7] suite
Documentation/git-gc.txt
+7
-7
@@ -15,7 +15,7 @@ DESCRIPTION
15
Runs a number of housekeeping tasks within the current repository,
16
such as compressing file revisions (to reduce disk space and increase
17
performance) and removing unreachable objects which may have been
18
-created from prior invocations of gitlink:git-add[1].
18
+created from prior invocations of linkgit:git-add[1].
19
20
Users are encouraged to run this task on a regular basis within
21
each repository to maintain good disk space utilization and good
@@ -98,15 +98,15 @@ The optional configuration variable 'gc.aggressiveWindow' controls how
98
much time is spent optimizing the delta compression of the objects in
99
the repository when the --aggressive option is specified. The larger
100
the value, the more time is spent optimizing the delta compression. See
101
-the documentation for the --window' option in gitlink:git-repack[1] for
101
+the documentation for the --window' option in linkgit:git-repack[1] for
102
more details. This defaults to 10.
103
104
See Also
105
--------
106
-gitlink:git-prune[1]
107
-gitlink:git-reflog[1]
108
-gitlink:git-repack[1]
109
-gitlink:git-rerere[1]
106
+linkgit:git-prune[1]
107
+linkgit:git-reflog[1]
108
+linkgit:git-repack[1]
109
+linkgit:git-rerere[1]
110
111
Author
112
------
@@ -114,4 +114,4 @@ Written by Shawn O. Pearce <spearce@spearce.org>
114
115
GIT
116
---
117
-Part of the gitlink:git[7] suite
117
+Part of the linkgit:git[7] suite
Documentation/git-get-tar-commit-id.txt
+2
-2
@@ -14,7 +14,7 @@ SYNOPSIS
14
DESCRIPTION
15
-----------
16
Acts as a filter, extracting the commit ID stored in archives created by
17
-gitlink:git-archive[1]. It reads only the first 1024 bytes of input, thus its
17
+linkgit:git-archive[1]. It reads only the first 1024 bytes of input, thus its
18
runtime is not influenced by the size of <tarfile> very much.
19
20
If no commit ID is found, git-get-tar-commit-id quietly exists with a
@@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
33
34
GIT
35
---
36
-Part of the gitlink:git[7] suite
36
+Part of the linkgit:git[7] suite
Documentation/git-grep.txt
+1
-1
@@ -143,4 +143,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
143
144
GIT
145
---
146
-Part of the gitlink:git[7] suite
146
+Part of the linkgit:git[7] suite
Documentation/git-gui.txt
+2
-2
@@ -16,7 +16,7 @@ on allowing users to make changes to their repository by making
16
new commits, amending existing ones, creating branches, performing
17
local merges, and fetching/pushing to remote repositories.
18
19
-Unlike gitlink:gitk[1], git-gui focuses on commit generation
19
+Unlike linkgit:gitk[1], git-gui focuses on commit generation
20
and single file annotation, and does not show project history.
21
It does however supply menu actions to start a gitk session from
22
within git-gui.
@@ -112,4 +112,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
112
113
GIT
114
---
115
-Part of the gitlink:git[7] suite
115
+Part of the linkgit:git[7] suite
Documentation/git-hash-object.txt
+1
-1
@@ -42,4 +42,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
42
43
GIT
44
---
45
-Part of the gitlink:git[7] suite
45
+Part of the linkgit:git[7] suite
Documentation/git-help.txt
+3
-3
@@ -85,7 +85,7 @@ $ git config --global web.browser firefox
85
------------------------------------------------
86
87
as they are probably more user specific than repository specific.
88
-See gitlink:git-config[1] for more information about this.
88
+See linkgit:git-config[1] for more information about this.
89
90
Author
91
------
@@ -94,10 +94,10 @@ Written by Junio C Hamano <gitster@pobox.com> and the git-list
94
95
Documentation
96
-------------
97
-Initial documentation was part of the gitlink:git[7] man page.
97
+Initial documentation was part of the linkgit:git[7] man page.
98
Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a
99
little. Maintenance is done by the git-list <git@vger.kernel.org>.
100
101
GIT
102
---
103
-Part of the gitlink:git[7] suite
103
+Part of the linkgit:git[7] suite
Documentation/git-http-fetch.txt
+1
-1
@@ -53,4 +53,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
53
54
GIT
55
---
56
-Part of the gitlink:git[7] suite
56
+Part of the linkgit:git[7] suite
Documentation/git-http-push.txt
+1
-1
@@ -98,4 +98,4 @@ Documentation by Nick Hengeveld
98
99
GIT
100
---
101
-Part of the gitlink:git[7] suite
101
+Part of the linkgit:git[7] suite
Documentation/git-imap-send.txt
+1
-1
@@ -59,4 +59,4 @@ Documentation by Mike McCormack
59
60
GIT
61
---
62
-Part of the gitlink:git[7] suite
62
+Part of the linkgit:git[7] suite
Documentation/git-index-pack.txt
+5
-5
@@ -43,10 +43,10 @@ OPTIONS
43
a default name determined from the pack content. If
44
<pack-file> is not specified consider using --keep to
45
prevent a race condition between this process and
46
- gitlink:git-repack[1].
46
+ linkgit:git-repack[1].
47
48
--fix-thin::
49
- It is possible for gitlink:git-pack-objects[1] to build
49
+ It is possible for linkgit:git-pack-objects[1] to build
50
"thin" pack, which records objects in deltified form based on
51
objects not included in the pack to reduce network traffic.
52
Those objects are expected to be present on the receiving end
@@ -59,7 +59,7 @@ OPTIONS
59
Before moving the index into its final destination
60
create an empty .keep file for the associated pack file.
61
This option is usually necessary with --stdin to prevent a
62
- simultaneous gitlink:git-repack[1] process from deleting
62
+ simultaneous linkgit:git-repack[1] process from deleting
63
the newly constructed pack and index before refs can be
64
updated to use objects contained in the pack.
65
@@ -83,7 +83,7 @@ Once the index has been created, the list of object names is sorted
83
and the SHA1 hash of that list is printed to stdout. If --stdin was
84
also used then this is prefixed by either "pack\t", or "keep\t" if a
85
new .keep file was successfully created. This is useful to remove a
86
-.keep file used as a lock to prevent the race with gitlink:git-repack[1]
86
+.keep file used as a lock to prevent the race with linkgit:git-repack[1]
87
mentioned above.
88
89
@@ -97,4 +97,4 @@ Documentation by Sergey Vlasov
97
98
GIT
99
---
100
-Part of the gitlink:git[7] suite
100
+Part of the linkgit:git[7] suite
Documentation/git-init-db.txt
+1
-1
@@ -14,5 +14,5 @@ SYNOPSIS
14
DESCRIPTION
15
-----------
16
17
-This is a synonym for gitlink:git-init[1]. Please refer to the
17
+This is a synonym for linkgit:git-init[1]. Please refer to the
18
documentation of that command.
Documentation/git-init.txt
+1
-1
@@ -111,4 +111,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
111
112
GIT
113
---
114
-Part of the gitlink:git[7] suite
114
+Part of the linkgit:git[7] suite
Documentation/git-instaweb.txt
+1
-1
@@ -84,4 +84,4 @@ Documentation by Eric Wong <normalperson@yhbt.net>.
84
85
GIT
86
---
87
-Part of the gitlink:git[7] suite
87
+Part of the linkgit:git[7] suite
Documentation/git-log.txt
+5
-5
@@ -14,9 +14,9 @@ DESCRIPTION
14
-----------
15
Shows the commit logs.
16
17
-The command takes options applicable to the gitlink:git-rev-list[1]
17
+The command takes options applicable to the linkgit:git-rev-list[1]
18
command to control what is shown and how, and options applicable to
19
-the gitlink:git-diff-tree[1] commands to control how the changes
19
+the linkgit:git-diff-tree[1] commands to control how the changes
20
each commit introduces are shown.
21
22
This manual page describes only the most frequently used options.
@@ -39,7 +39,7 @@ include::diff-options.txt[]
39
`HEAD`, i.e. the tip of the current branch.
40
For a more complete list of ways to spell <since>
41
and <until>, see "SPECIFYING REVISIONS" section in
42
- gitlink:git-rev-parse[1].
42
+ linkgit:git-rev-parse[1].
43
44
--first-parent::
45
Follow only the first parent commit upon seeing a merge
@@ -54,7 +54,7 @@ include::diff-options.txt[]
54
Show commits as they were recorded in the reflog. The log contains
55
a record about how the tip of a reference was changed.
56
Cannot be combined with --reverse.
57
- See also gitlink:git-reflog[1].
57
+ See also linkgit:git-reflog[1].
58
59
--decorate::
60
Print out the ref names of any commits that are shown.
@@ -129,4 +129,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
129
130
GIT
131
---
132
-Part of the gitlink:git[7] suite
132
+Part of the linkgit:git[7] suite
Documentation/git-lost-found.txt
+2
-2
@@ -12,7 +12,7 @@ SYNOPSIS
12
DESCRIPTION
13
-----------
14
15
-*NOTE*: this command is deprecated. Use gitlink:git-fsck[1] with
15
+*NOTE*: this command is deprecated. Use linkgit:git-fsck[1] with
16
the option '--lost-found' instead.
17
18
Finds dangling commits and tags from the object database, and
@@ -78,4 +78,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
78
79
GIT
80
---
81
-Part of the gitlink:git[7] suite
81
+Part of the linkgit:git[7] suite
Documentation/git-ls-files.txt
+4
-4
@@ -106,7 +106,7 @@ OPTIONS
106
-v::
107
Similar to `-t`, but use lowercase letters for files
108
that are marked as 'assume unchanged' (see
109
- gitlink:git-update-index[1]).
109
+ linkgit:git-update-index[1]).
110
111
--full-name::
112
When run from a subdirectory, the command usually
@@ -152,7 +152,7 @@ Exclude Patterns
152
153
'git-ls-files' can use a list of "exclude patterns" when
154
traversing the directory tree and finding files to show when the
155
-flags --others or --ignored are specified. gitlink:gitignore[5]
155
+flags --others or --ignored are specified. linkgit:gitignore[5]
156
specifies the format of exclude patterns.
157
158
These exclude patterns come from these places, in order:
@@ -179,7 +179,7 @@ pattern file appears in.
179
180
See Also
181
--------
182
-gitlink:git-read-tree[1], gitlink:gitignore[5]
182
+linkgit:git-read-tree[1], linkgit:gitignore[5]
183
184
185
Author
@@ -192,4 +192,4 @@ Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list
192
193
GIT
194
---
195
-Part of the gitlink:git[7] suite
195
+Part of the linkgit:git[7] suite
Documentation/git-ls-remote.txt
+2
-2
@@ -27,7 +27,7 @@ OPTIONS
27
displayed.
28
29
-u <exec>, --upload-pack=<exec>::
30
- Specify the full path of gitlink:git-upload-pack[1] on the remote
30
+ Specify the full path of linkgit:git-upload-pack[1] on the remote
31
host. This allows listing references from repositories accessed via
32
SSH and where the SSH daemon does not use the PATH configured by the
33
user.
@@ -69,4 +69,4 @@ Written by Junio C Hamano <junkio@cox.net>
69
70
GIT
71
---
72
-Part of the gitlink:git[7] suite
72
+Part of the linkgit:git[7] suite
Documentation/git-ls-tree.txt
+1
-1
@@ -91,4 +91,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list
91
92
GIT
93
---
94
-Part of the gitlink:git[7] suite
94
+Part of the linkgit:git[7] suite
Documentation/git-mailinfo.txt
+2
-2
@@ -18,7 +18,7 @@ writes the commit log message in <msg> file, and the patches in
18
<patch> file. The author name, e-mail and e-mail subject are
19
written out to the standard output to be used by git-am
20
to create a commit. It is usually not necessary to use this
21
-command directly. See gitlink:git-am[1] instead.
21
+command directly. See linkgit:git-am[1] instead.
22
23
24
OPTIONS
@@ -66,4 +66,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
66
67
GIT
68
---
69
-Part of the gitlink:git[7] suite
69
+Part of the linkgit:git[7] suite
Documentation/git-mailsplit.txt
+1
-1
@@ -55,4 +55,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
55
56
GIT
57
---
58
-Part of the gitlink:git[7] suite
58
+Part of the linkgit:git[7] suite
Documentation/git-merge-base.txt
+1
-1
@@ -39,4 +39,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
39
40
GIT
41
---
42
-Part of the gitlink:git[7] suite
42
+Part of the linkgit:git[7] suite
Documentation/git-merge-file.txt
+2
-2
@@ -41,7 +41,7 @@ conflicts otherwise. If the merge was clean, the exit value is 0.
41
42
git-merge-file is designed to be a minimal clone of RCS merge, that is, it
43
implements all of RCS merge's functionality which is needed by
44
-gitlink:git[1].
44
+linkgit:git[1].
45
46
47
OPTIONS
@@ -89,4 +89,4 @@ with parts copied from the original documentation of RCS merge.
89
90
GIT
91
---
92
-Part of the gitlink:git[7] suite
92
+Part of the linkgit:git[7] suite
Documentation/git-merge-index.txt
+1
-1
@@ -84,4 +84,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
84
85
GIT
86
---
87
-Part of the gitlink:git[7] suite
87
+Part of the linkgit:git[7] suite
Documentation/git-merge-one-file.txt
+1
-1
@@ -26,4 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
26
27
GIT
28
---
29
-Part of the gitlink:git[7] suite
29
+Part of the linkgit:git[7] suite
Documentation/git-merge-tree.txt
+1
-1
@@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
33
34
GIT
35
---
36
-Part of the gitlink:git[7] suite
36
+Part of the linkgit:git[7] suite
Documentation/git-merge.txt
+4
-4
@@ -42,7 +42,7 @@ include::merge-strategies.txt[]
42
43
If you tried a merge which resulted in a complex conflicts and
44
would want to start over, you can recover with
45
-gitlink:git-reset[1].
45
+linkgit:git-reset[1].
46
47
CONFIGURATION
48
-------------
@@ -163,8 +163,8 @@ After seeing a conflict, you can do two things:
163
164
SEE ALSO
165
--------
166
-gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1],
167
-gitlink:gitattributes[5]
166
+linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],
167
+linkgit:gitattributes[5]
168
169
170
Author
@@ -178,4 +178,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
178
179
GIT
180
---
181
-Part of the gitlink:git[7] suite
181
+Part of the linkgit:git[7] suite
Documentation/git-mergetool.txt
+2
-2
@@ -13,7 +13,7 @@ DESCRIPTION
13
-----------
14
15
Use 'git mergetool' to run one of several merge utilities to resolve
16
-merge conflicts. It is typically run after gitlink:git-merge[1].
16
+merge conflicts. It is typically run after linkgit:git-merge[1].
17
18
If one or more <file> parameters are given, the merge tool program will
19
be run to resolve differences on each file. If no <file> names are
@@ -48,4 +48,4 @@ Documentation by Theodore Y Ts'o.
48
49
GIT
50
---
51
-Part of the gitlink:git[7] suite
51
+Part of the linkgit:git[7] suite
Documentation/git-mktag.txt
+1
-1
@@ -43,4 +43,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
43
44
GIT
45
---
46
-Part of the gitlink:git[7] suite
46
+Part of the linkgit:git[7] suite
Documentation/git-mktree.txt
+1
-1
@@ -31,4 +31,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
31
32
GIT
33
---
34
-Part of the gitlink:git[7] suite
34
+Part of the linkgit:git[7] suite
Documentation/git-mv.txt
+1
-1
@@ -50,4 +50,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
50
51
GIT
52
---
53
-Part of the gitlink:git[7] suite
53
+Part of the linkgit:git[7] suite
Documentation/git-name-rev.txt
+2
-2
@@ -38,7 +38,7 @@ OPTIONS
38
Instead of printing both the SHA-1 and the name, print only
39
the name. If given with --tags the usual tag prefix of
40
"tags/" is also omitted from the name, matching the output
41
- of gitlink:git-describe[1] more closely. This option
41
+ of linkgit:git-describe[1] more closely. This option
42
cannot be combined with --stdin.
43
44
EXAMPLE
@@ -75,4 +75,4 @@ Documentation by Johannes Schindelin.
75
76
GIT
77
---
78
-Part of the gitlink:git[7] suite
78
+Part of the linkgit:git[7] suite
Documentation/git-pack-objects.txt
+5
-5
@@ -58,7 +58,7 @@ base-name::
58
--revs::
59
Read the revision arguments from the standard input, instead of
60
individual object names. The revision arguments are processed
61
- the same way as gitlink:git-rev-list[1] with `--objects` flag
61
+ the same way as linkgit:git-rev-list[1] with `--objects` flag
62
uses its `commit` arguments to build the list of objects it
63
outputs. The objects on the resulting list are packed.
64
@@ -193,10 +193,10 @@ Documentation by Junio C Hamano
193
194
See Also
195
--------
196
-gitlink:git-rev-list[1]
197
-gitlink:git-repack[1]
198
-gitlink:git-prune-packed[1]
196
+linkgit:git-rev-list[1]
197
+linkgit:git-repack[1]
198
+linkgit:git-prune-packed[1]
199
200
GIT
201
---
202
-Part of the gitlink:git[7] suite
202
+Part of the linkgit:git[7] suite
Documentation/git-pack-redundant.txt
+4
-4
@@ -48,10 +48,10 @@ Documentation by Lukas Sandström <lukass@etek.chalmers.se>
48
49
See Also
50
--------
51
-gitlink:git-pack-objects[1]
52
-gitlink:git-repack[1]
53
-gitlink:git-prune-packed[1]
51
+linkgit:git-pack-objects[1]
52
+linkgit:git-repack[1]
53
+linkgit:git-prune-packed[1]
54
55
GIT
56
---
57
-Part of the gitlink:git[7] suite
57
+Part of the linkgit:git[7] suite
Documentation/git-pack-refs.txt
+1
-1
@@ -63,4 +63,4 @@ Written by Linus Torvalds <torvalds@osdl.org>
63
64
GIT
65
---
66
-Part of the gitlink:git[7] suite
66
+Part of the linkgit:git[7] suite
Documentation/git-parse-remote.txt
+1
-1
@@ -47,4 +47,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
47
48
GIT
49
---
50
-Part of the gitlink:git[7] suite
50
+Part of the linkgit:git[7] suite
Documentation/git-patch-id.txt
+1
-1
@@ -39,4 +39,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
39
40
GIT
41
---
42
-Part of the gitlink:git[7] suite
42
+Part of the linkgit:git[7] suite
Documentation/git-peek-remote.txt
+1
-1
@@ -47,4 +47,4 @@ Documentation by Junio C Hamano.
47
48
GIT
49
---
50
-Part of the gitlink:git[7] suite
50
+Part of the linkgit:git[7] suite
Documentation/git-prune-packed.txt
+3
-3
@@ -44,9 +44,9 @@ Documentation by Ryan Anderson <ryan@michonline.com>
44
45
See Also
46
--------
47
-gitlink:git-pack-objects[1]
48
-gitlink:git-repack[1]
47
+linkgit:git-pack-objects[1]
48
+linkgit:git-repack[1]
49
50
GIT
51
---
52
-Part of the gitlink:git[7] suite
52
+Part of the linkgit:git[7] suite
Documentation/git-prune.txt
+1
-1
@@ -60,4 +60,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
60
61
GIT
62
---
63
-Part of the gitlink:git[7] suite
63
+Part of the linkgit:git[7] suite
Documentation/git-pull.txt
+5
-5
@@ -38,7 +38,7 @@ include::merge-strategies.txt[]
38
*NOTE:* This is a potentially _dangerous_ mode of operation.
39
It rewrites history, which does not bode well when you
40
published that history already. Do *not* use this option
41
- unless you have read gitlink:git-rebase[1] carefully.
41
+ unless you have read linkgit:git-rebase[1] carefully.
42
43
\--no-rebase::
44
Override earlier \--rebase.
@@ -106,7 +106,7 @@ git pull, git pull origin::
106
current branch. Normally the branch merged in is
107
the HEAD of the remote repository, but the choice is
108
determined by the branch.<name>.remote and
109
- branch.<name>.merge options; see gitlink:git-config[1]
109
+ branch.<name>.merge options; see linkgit:git-config[1]
110
for details.
111
112
git pull origin next::
@@ -153,12 +153,12 @@ The final command then merges the newly fetched `tmp` into master.
153
154
If you tried a pull which resulted in a complex conflicts and
155
would want to start over, you can recover with
156
-gitlink:git-reset[1].
156
+linkgit:git-reset[1].
157
158
159
SEE ALSO
160
--------
161
-gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-config[1]
161
+linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]
162
163
164
Author
@@ -174,4 +174,4 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
174
175
GIT
176
---
177
-Part of the gitlink:git[7] suite
177
+Part of the linkgit:git[7] suite
Documentation/git-push.txt
+2
-2
@@ -20,7 +20,7 @@ necessary to complete the given refs.
20
21
You can make interesting things happen to a repository
22
every time you push into it, by setting up 'hooks' there. See
23
-documentation for gitlink:git-receive-pack[1].
23
+documentation for linkgit:git-receive-pack[1].
24
25
26
OPTIONS
@@ -145,4 +145,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
145
146
GIT
147
---
148
-Part of the gitlink:git[7] suite
148
+Part of the linkgit:git[7] suite
Documentation/git-quiltimport.txt
+1
-1
@@ -57,4 +57,4 @@ Documentation by Eric Biederman <ebiederm@lnxi.com>
57
58
GIT
59
---
60
-Part of the gitlink:git[7] suite
60
+Part of the linkgit:git[7] suite
Documentation/git-read-tree.txt
+4
-4
@@ -15,7 +15,7 @@ DESCRIPTION
15
-----------
16
Reads the tree information given by <tree-ish> into the index,
17
but does not actually *update* any of the files it "caches". (see:
18
-gitlink:git-checkout-index[1])
18
+linkgit:git-checkout-index[1])
19
20
Optionally, it can merge a tree into the index, perform a
21
fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m`
@@ -347,8 +347,8 @@ have finished your work-in-progress), attempt the merge again.
347
348
See Also
349
--------
350
-gitlink:git-write-tree[1]; gitlink:git-ls-files[1];
351
-gitlink:gitignore[5]
350
+linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
351
+linkgit:gitignore[5]
352
353
354
Author
@@ -361,4 +361,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
361
362
GIT
363
---
364
-Part of the gitlink:git[7] suite
364
+Part of the linkgit:git[7] suite
Documentation/git-rebase.txt
+5
-5
@@ -235,7 +235,7 @@ OPTIONS
235
236
--whitespace=<nowarn|warn|error|error-all|strip>::
237
This flag is passed to the `git-apply` program
238
- (see gitlink:git-apply[1]) that applies the patch.
238
+ (see linkgit:git-apply[1]) that applies the patch.
239
240
-i, \--interactive::
241
Make a list of the commits which are about to be rebased. Let the
@@ -374,8 +374,8 @@ add other commits. This can be used to split a commit into two:
374
However, the working tree stays the same.
375
376
- Now add the changes to the index that you want to have in the first
377
- commit. You can use gitlink:git-add[1] (possibly interactively) and/or
378
- gitlink:git-gui[1] to do that.
377
+ commit. You can use linkgit:git-add[1] (possibly interactively) and/or
378
+ linkgit:git-gui[1] to do that.
379
380
- Commit the now-current index with whatever commit message is appropriate
381
now.
@@ -386,7 +386,7 @@ add other commits. This can be used to split a commit into two:
386
387
If you are not absolutely sure that the intermediate revisions are
388
consistent (they compile, pass the testsuite, etc.) you should use
389
-gitlink:git-stash[1] to stash away the not-yet-committed changes
389
+linkgit:git-stash[1] to stash away the not-yet-committed changes
390
after each commit, test, and amend the commit if fixes are necessary.
391
392
@@ -401,4 +401,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
401
402
GIT
403
---
404
-Part of the gitlink:git[7] suite
404
+Part of the linkgit:git[7] suite
Documentation/git-receive-pack.txt
+2
-2
@@ -149,7 +149,7 @@ if the repository is packed and is served via a dumb transport.
149
150
SEE ALSO
151
--------
152
-gitlink:git-send-pack[1]
152
+linkgit:git-send-pack[1]
153
154
155
Author
@@ -162,4 +162,4 @@ Documentation by Junio C Hamano.
162
163
GIT
164
---
165
-Part of the gitlink:git[7] suite
165
+Part of the linkgit:git[7] suite
Documentation/git-reflog.txt
+4
-4
@@ -28,19 +28,19 @@ The subcommand "expire" is used to prune older reflog entries.
28
Entries older than `expire` time, or entries older than
29
`expire-unreachable` time and are not reachable from the current
30
tip, are removed from the reflog. This is typically not used
31
-directly by the end users -- instead, see gitlink:git-gc[1].
31
+directly by the end users -- instead, see linkgit:git-gc[1].
32
33
The subcommand "show" (which is also the default, in the absence of any
34
subcommands) will take all the normal log options, and show the log of
35
the reference provided in the command-line (or `HEAD`, by default).
36
The reflog will cover all recent actions (HEAD reflog records branch switching
37
as well). It is an alias for 'git log -g --abbrev-commit --pretty=oneline';
38
-see gitlink:git-log[1].
38
+see linkgit:git-log[1].
39
40
The reflog is useful in various git commands, to specify the old value
41
of a reference. For example, `HEAD@\{2\}` means "where HEAD used to be
42
two moves ago", `master@\{one.week.ago\}` means "where master used to
43
-point to one week ago", and so on. See gitlink:git-rev-parse[1] for
43
+point to one week ago", and so on. See linkgit:git-rev-parse[1] for
44
more details.
45
46
@@ -88,4 +88,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
88
89
GIT
90
---
91
-Part of the gitlink:git[7] suite
91
+Part of the linkgit:git[7] suite
Documentation/git-relink.txt
+1
-1
@@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
33
34
GIT
35
---
36
-Part of the gitlink:git[7] suite
36
+Part of the linkgit:git[7] suite
Documentation/git-remote.txt
+6
-6
@@ -81,7 +81,7 @@ remotes.<group>. If a named group is not specified on the command line,
81
the configuration parameter remotes.default will get used; if
82
remotes.default is not defined, all remotes which do not have the
83
configuration parameter remote.<name>.skipDefaultUpdate set to true will
84
-be updated. (See gitlink:git-config[1]).
84
+be updated. (See linkgit:git-config[1]).
85
86
87
DISCUSSION
@@ -89,7 +89,7 @@ DISCUSSION
89
90
The remote configuration is achieved using the `remote.origin.url` and
91
`remote.origin.fetch` configuration variables. (See
92
-gitlink:git-config[1]).
92
+linkgit:git-config[1]).
93
94
Examples
95
--------
@@ -128,9 +128,9 @@ $ git merge origin
128
129
See Also
130
--------
131
-gitlink:git-fetch[1]
132
-gitlink:git-branch[1]
133
-gitlink:git-config[1]
131
+linkgit:git-fetch[1]
132
+linkgit:git-branch[1]
133
+linkgit:git-config[1]
134
135
Author
136
------
@@ -144,4 +144,4 @@ Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.
144
145
GIT
146
---
147
-Part of the gitlink:git[7] suite
147
+Part of the linkgit:git[7] suite
Documentation/git-repack.txt
+7
-7
@@ -40,19 +40,19 @@ OPTIONS
40
-d::
41
After packing, if the newly created packs make some
42
existing packs redundant, remove the redundant packs.
43
- Also runs gitlink:git-prune-packed[1].
43
+ Also runs linkgit:git-prune-packed[1].
44
45
-l::
46
Pass the `--local` option to `git pack-objects`, see
47
- gitlink:git-pack-objects[1].
47
+ linkgit:git-pack-objects[1].
48
49
-f::
50
Pass the `--no-reuse-delta` option to `git pack-objects`, see
51
- gitlink:git-pack-objects[1].
51
+ linkgit:git-pack-objects[1].
52
53
-q::
54
Pass the `-q` option to `git pack-objects`, see
55
- gitlink:git-pack-objects[1].
55
+ linkgit:git-pack-objects[1].
56
57
-n::
58
Do not update the server information with
@@ -109,9 +109,9 @@ Documentation by Ryan Anderson <ryan@michonline.com>
109
110
See Also
111
--------
112
-gitlink:git-pack-objects[1]
113
-gitlink:git-prune-packed[1]
112
+linkgit:git-pack-objects[1]
113
+linkgit:git-prune-packed[1]
114
115
GIT
116
---
117
-Part of the gitlink:git[7] suite
117
+Part of the linkgit:git[7] suite
Documentation/git-repo-config.txt
+1
-1
@@ -14,5 +14,5 @@ SYNOPSIS
14
DESCRIPTION
15
-----------
16
17
-This is a synonym for gitlink:git-config[1]. Please refer to the
17
+This is a synonym for linkgit:git-config[1]. Please refer to the
18
documentation of that command.
Documentation/git-request-pull.txt
+1
-1
@@ -36,4 +36,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
36
37
GIT
38
---
39
-Part of the gitlink:git[7] suite
39
+Part of the linkgit:git[7] suite
Documentation/git-rerere.txt
+2
-2
@@ -33,7 +33,7 @@ its working state.
33
'clear'::
34
35
This resets the metadata used by rerere if a merge resolution is to be
36
-is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
36
+is aborted. Calling linkgit:git-am[1] --skip or linkgit:git-rebase[1]
37
[--skip|--abort] will automatically invoke this command.
38
39
'diff'::
@@ -204,4 +204,4 @@ Written by Junio C Hamano <junkio@cox.net>
204
205
GIT
206
---
207
-Part of the gitlink:git[7] suite
207
+Part of the linkgit:git[7] suite
Documentation/git-reset.txt
+4
-4
@@ -21,7 +21,7 @@ commit (or set of commits) and want to redo that part without showing
21
the undo in the history.
22
23
If you want to undo a commit other than the latest on a branch,
24
-gitlink:git-revert[1] is your friend.
24
+linkgit:git-revert[1] is your friend.
25
26
The second form with 'paths' is used to revert selected paths in
27
the index from a given commit, without moving HEAD.
@@ -37,7 +37,7 @@ OPTIONS
37
--soft::
38
Does not touch the index file nor the working tree at all, but
39
requires them to be in a good order. This leaves all your changed
40
- files "Added but not yet committed", as gitlink:git-status[1] would
40
+ files "Added but not yet committed", as linkgit:git-status[1] would
41
put it.
42
43
--hard::
@@ -71,7 +71,7 @@ message, or both. Leaves working tree as it was before "reset".
71
commit by starting with its log message. If you do not need to
72
edit the message further, you can give -C option instead.
73
+
74
-See also the --amend option to gitlink:git-commit[1].
74
+See also the --amend option to linkgit:git-commit[1].
75
76
Undo commits permanently::
77
+
@@ -186,4 +186,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
186
187
GIT
188
---
189
-Part of the gitlink:git[7] suite
189
+Part of the linkgit:git[7] suite
Documentation/git-rev-list.txt
+10
-10
@@ -79,11 +79,11 @@ between the two operands. The following two commands are equivalent:
79
$ git-rev-list A...B
80
-----------------------------------------------------------------------
81
82
-gitlink:git-rev-list[1] is a very essential git program, since it
82
+linkgit:git-rev-list[1] is a very essential git program, since it
83
provides the ability to build and traverse commit ancestry graphs. For
84
this reason, it has a lot of different options that enables it to be
85
-used by commands as different as gitlink:git-bisect[1] and
86
-gitlink:git-repack[1].
85
+used by commands as different as linkgit:git-bisect[1] and
86
+linkgit:git-repack[1].
87
88
OPTIONS
89
-------
@@ -91,9 +91,9 @@ OPTIONS
91
Commit Formatting
92
~~~~~~~~~~~~~~~~~
93
94
-Using these options, gitlink:git-rev-list[1] will act similar to the
95
-more specialized family of commit log tools: gitlink:git-log[1],
96
-gitlink:git-show[1], and gitlink:git-whatchanged[1]
94
+Using these options, linkgit:git-rev-list[1] will act similar to the
95
+more specialized family of commit log tools: linkgit:git-log[1],
96
+linkgit:git-show[1], and linkgit:git-whatchanged[1]
97
98
include::pretty-options.txt[]
99
@@ -167,8 +167,8 @@ Diff Formatting
167
~~~~~~~~~~~~~~~
168
169
Below are listed options that control the formatting of diff output.
170
-Some of them are specific to gitlink:git-rev-list[1], however other diff
171
-options may be given. See gitlink:git-diff-files[1] for more options.
170
+Some of them are specific to linkgit:git-rev-list[1], however other diff
171
+options may be given. See linkgit:git-diff-files[1] for more options.
172
173
-c::
174
@@ -428,7 +428,7 @@ These options are mostly targeted for packing of git repositories.
428
429
Similar to '--objects', but also print the IDs of excluded
430
commits prefixed with a "-" character. This is used by
431
- gitlink:git-pack-objects[1] to build "thin" pack, which records
431
+ linkgit:git-pack-objects[1] to build "thin" pack, which records
432
objects in deltified form based on objects contained in these
433
excluded commits to reduce network traffic.
434
@@ -460,4 +460,4 @@ and the git-list <git@vger.kernel.org>.
460
461
GIT
462
---
463
-Part of the gitlink:git[7] suite
463
+Part of the linkgit:git[7] suite
Documentation/git-rev-parse.txt
+1
-1
@@ -378,4 +378,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
378
379
GIT
380
---
381
-Part of the gitlink:git[7] suite
381
+Part of the linkgit:git[7] suite
Documentation/git-revert.txt
+2
-2
@@ -20,7 +20,7 @@ OPTIONS
20
<commit>::
21
Commit to revert.
22
For a more complete list of ways to spell commit names, see
23
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
23
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
24
25
-e|--edit::
26
With this option, `git-revert` will let you edit the commit
@@ -62,4 +62,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
62
63
GIT
64
---
65
-Part of the gitlink:git[7] suite
65
+Part of the linkgit:git[7] suite
Documentation/git-rm.txt
+2
-2
@@ -83,7 +83,7 @@ git-rm -f git-*.sh::
83
84
See Also
85
--------
86
-gitlink:git-add[1]
86
+linkgit:git-add[1]
87
88
Author
89
------
@@ -95,4 +95,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
95
96
GIT
97
---
98
-Part of the gitlink:git[7] suite
98
+Part of the linkgit:git[7] suite
Documentation/git-send-email.txt
+1
-1
@@ -196,4 +196,4 @@ Documentation by Ryan Anderson
196
197
GIT
198
---
199
-Part of the gitlink:git[7] suite
199
+Part of the linkgit:git[7] suite
Documentation/git-send-pack.txt
+3
-3
@@ -12,7 +12,7 @@ SYNOPSIS
12
13
DESCRIPTION
14
-----------
15
-Usually you would want to use gitlink:git-push[1] which is a
15
+Usually you would want to use linkgit:git-push[1] which is a
16
higher level wrapper of this command instead.
17
18
Invokes 'git-receive-pack' on a possibly remote repository, and
@@ -86,7 +86,7 @@ and the destination side (after the colon). The ref to be
86
pushed is determined by finding a match that matches the source
87
side, and where it is pushed is determined by using the
88
destination side. The rules used to match a ref are the same
89
-rules used by gitlink:git-rev-parse[1] to resolve a symbolic ref
89
+rules used by linkgit:git-rev-parse[1] to resolve a symbolic ref
90
name.
91
92
- It is an error if <src> does not match exactly one of the
@@ -125,4 +125,4 @@ Documentation by Junio C Hamano.
125
126
GIT
127
---
128
-Part of the gitlink:git[7] suite
128
+Part of the linkgit:git[7] suite
Documentation/git-sh-setup.txt
+1
-1
@@ -77,4 +77,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
77
78
GIT
79
---
80
-Part of the gitlink:git[7] suite
80
+Part of the linkgit:git[7] suite
Documentation/git-shell.txt
+1
-1
@@ -31,4 +31,4 @@ Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.
31
32
GIT
33
---
34
-Part of the gitlink:git[7] suite
34
+Part of the linkgit:git[7] suite
Documentation/git-shortlog.txt
+1
-1
@@ -59,4 +59,4 @@ Documentation by Junio C Hamano.
59
60
GIT
61
---
62
-Part of the gitlink:git[7] suite
62
+Part of the linkgit:git[7] suite
Documentation/git-show-branch.txt
+1
-1
@@ -190,4 +190,4 @@ Documentation by Junio C Hamano.
190
191
GIT
192
---
193
-Part of the gitlink:git[7] suite
193
+Part of the linkgit:git[7] suite
Documentation/git-show-index.txt
+1
-1
@@ -31,4 +31,4 @@ Documentation by Junio C Hamano
31
32
GIT
33
---
34
-Part of the gitlink:git[7] suite
34
+Part of the linkgit:git[7] suite
Documentation/git-show-ref.txt
+3
-3
@@ -130,7 +130,7 @@ When using the '--verify' flag, the command requires an exact path:
130
131
will only match the exact branch called "master".
132
133
-If nothing matches, gitlink:git-show-ref[1] will return an error code of 1,
133
+If nothing matches, linkgit:git-show-ref[1] will return an error code of 1,
134
and in the case of verification, it will show an error message.
135
136
For scripting, you can ask it to be quiet with the "--quiet" flag, which
@@ -160,7 +160,7 @@ to get a listing of all tags together with what they dereference.
160
161
SEE ALSO
162
--------
163
-gitlink:git-ls-remote[1]
163
+linkgit:git-ls-remote[1]
164
165
AUTHORS
166
-------
@@ -169,4 +169,4 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.
169
170
GIT
171
---
172
-Part of the gitlink:git[7] suite
172
+Part of the linkgit:git[7] suite
Documentation/git-show.txt
+4
-4
@@ -20,12 +20,12 @@ presents the merge commit in a special format as produced by
20
21
For tags, it shows the tag message and the referenced objects.
22
23
-For trees, it shows the names (equivalent to gitlink:git-ls-tree[1]
23
+For trees, it shows the names (equivalent to linkgit:git-ls-tree[1]
24
with \--name-only).
25
26
For plain blobs, it shows the plain contents.
27
28
-The command takes options applicable to the gitlink:git-diff-tree[1] command to
28
+The command takes options applicable to the linkgit:git-diff-tree[1] command to
29
control how the changes the commit introduces are shown.
30
31
This manual page describes only the most frequently used options.
@@ -36,7 +36,7 @@ OPTIONS
36
<object>::
37
The name of the object to show.
38
For a more complete list of ways to spell object names, see
39
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
39
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
40
41
include::pretty-options.txt[]
42
@@ -83,4 +83,4 @@ This manual page is a stub. You can help the git documentation by expanding it.
83
84
GIT
85
---
86
-Part of the gitlink:git[7] suite
86
+Part of the linkgit:git[7] suite
Documentation/git-stash.txt
+5
-5
@@ -156,10 +156,10 @@ $ git stash apply
156
157
SEE ALSO
158
--------
159
-gitlink:git-checkout[1],
160
-gitlink:git-commit[1],
161
-gitlink:git-reflog[1],
162
-gitlink:git-reset[1]
159
+linkgit:git-checkout[1],
160
+linkgit:git-commit[1],
161
+linkgit:git-reflog[1],
162
+linkgit:git-reset[1]
163
164
AUTHOR
165
------
@@ -167,4 +167,4 @@ Written by Nanako Shiraishi <nanako3@bluebottle.com>
167
168
GIT
169
---
170
-Part of the gitlink:git[7] suite
170
+Part of the linkgit:git[7] suite
Documentation/git-status.txt
+3
-3
@@ -15,7 +15,7 @@ DESCRIPTION
15
Displays paths that have differences between the index file and the
16
current HEAD commit, paths that have differences between the working
17
tree and the index file, and paths in the working tree that are not
18
-tracked by git (and are not ignored by gitlink:gitignore[5]). The first
18
+tracked by git (and are not ignored by linkgit:gitignore[5]). The first
19
are what you _would_ commit by running `git commit`; the second and
20
third are what you _could_ commit by running `git add` before running
21
`git commit`.
@@ -54,7 +54,7 @@ directory.
54
55
See Also
56
--------
57
-gitlink:gitignore[5]
57
+linkgit:gitignore[5]
58
59
Author
60
------
@@ -67,4 +67,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
67
68
GIT
69
---
70
-Part of the gitlink:git[7] suite
70
+Part of the linkgit:git[7] suite
Documentation/git-stripspace.txt
+1
-1
@@ -32,4 +32,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
32
33
GIT
34
---
35
-Part of the gitlink:git[7] suite
35
+Part of the linkgit:git[7] suite
Documentation/git-submodule.txt
+3
-3
@@ -28,7 +28,7 @@ add::
28
status::
29
Show the status of the submodules. This will print the SHA-1 of the
30
currently checked out commit for each submodule, along with the
31
- submodule path and the output of gitlink:git-describe[1] for the
31
+ submodule path and the output of linkgit:git-describe[1] for the
32
SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
33
initialized and `+` if the currently checked out submodule commit
34
does not match the SHA-1 found in the index of the containing
@@ -68,7 +68,7 @@ FILES
68
When initializing submodules, a .gitmodules file in the top-level directory
69
of the containing repository is used to find the url of each submodule.
70
This file should be formatted in the same way as `$GIT_DIR/config`. The key
71
-to each submodule url is "submodule.$name.url". See gitlink:gitmodules[5]
71
+to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5]
72
for details.
73
74
@@ -78,4 +78,4 @@ Written by Lars Hjemli <hjemli@gmail.com>
78
79
GIT
80
---
81
-Part of the gitlink:git[7] suite
81
+Part of the linkgit:git[7] suite
Documentation/git-svn.txt
+6
-6
@@ -12,7 +12,7 @@ SYNOPSIS
12
DESCRIPTION
13
-----------
14
git-svn is a simple conduit for changesets between Subversion and git.
15
-It is not to be confused with gitlink:git-svnimport[1], which is
15
+It is not to be confused with linkgit:git-svnimport[1], which is
16
read-only.
17
18
git-svn was originally designed for an individual developer who wants a
@@ -208,7 +208,7 @@ OPTIONS
208
--shared[={false|true|umask|group|all|world|everybody}]::
209
--template=<template_directory>::
210
Only used with the 'init' command.
211
- These are passed directly to gitlink:git-init[1].
211
+ These are passed directly to linkgit:git-init[1].
212
213
-r <ARG>::
214
--revision <ARG>::
@@ -261,7 +261,7 @@ config key: svn.edit
261
Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
262
263
They are both passed directly to git-diff-tree see
264
-gitlink:git-diff-tree[1] for more information.
264
+linkgit:git-diff-tree[1] for more information.
265
266
[verse]
267
config key: svn.l
@@ -299,7 +299,7 @@ with many revisions.
299
to fetch before repacking. This defaults to repacking every
300
1000 commits fetched if no argument is specified.
301
302
---repack-flags are passed directly to gitlink:git-repack[1].
302
+--repack-flags are passed directly to linkgit:git-repack[1].
303
304
[verse]
305
config key: svn.repack
@@ -561,11 +561,11 @@ however the remote wildcard may be anywhere as long as it's own
561
independent path component (surrounded by '/' or EOL). This
562
type of configuration is not automatically created by 'init' and
563
should be manually entered with a text-editor or using
564
-gitlink:git-config[1]
564
+linkgit:git-config[1]
565
566
SEE ALSO
567
--------
568
-gitlink:git-rebase[1]
568
+linkgit:git-rebase[1]
569
570
Author
571
------
Documentation/git-symbolic-ref.txt
+1
-1
@@ -58,4 +58,4 @@ Written by Junio C Hamano <junkio@cox.net>
58
59
GIT
60
---
61
-Part of the gitlink:git[7] suite
61
+Part of the linkgit:git[7] suite
Documentation/git-tag.txt
+1
-1
@@ -248,4 +248,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
248
249
GIT
250
---
251
-Part of the gitlink:git[7] suite
251
+Part of the linkgit:git[7] suite
Documentation/git-tar-tree.txt
+1
-1
@@ -86,4 +86,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
86
87
GIT
88
---
89
-Part of the gitlink:git[7] suite
89
+Part of the linkgit:git[7] suite
Documentation/git-unpack-file.txt
+1
-1
@@ -32,4 +32,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
32
33
GIT
34
---
35
-Part of the gitlink:git[7] suite
35
+Part of the linkgit:git[7] suite
Documentation/git-unpack-objects.txt
+1
-1
@@ -51,4 +51,4 @@ Documentation by Junio C Hamano
51
52
GIT
53
---
54
-Part of the gitlink:git[7] suite
54
+Part of the linkgit:git[7] suite
Documentation/git-update-index.txt
+6
-6
@@ -27,7 +27,7 @@ Modifies the index or directory cache. Each file mentioned is updated
27
into the index and any 'unmerged' or 'needs updating' state is
28
cleared.
29
30
-See also gitlink:git-add[1] for a more user-friendly way to do some of
30
+See also linkgit:git-add[1] for a more user-friendly way to do some of
31
the most common operations on the index.
32
33
The way "git-update-index" handles files it is told about can be modified
@@ -292,14 +292,14 @@ Configuration
292
293
The command honors `core.filemode` configuration variable. If
294
your repository is on an filesystem whose executable bits are
295
-unreliable, this should be set to 'false' (see gitlink:git-config[1]).
295
+unreliable, this should be set to 'false' (see linkgit:git-config[1]).
296
This causes the command to ignore differences in file modes recorded
297
in the index and the file mode on the filesystem if they differ only on
298
executable bit. On such an unfortunate filesystem, you may
299
need to use `git-update-index --chmod=`.
300
301
Quite similarly, if `core.symlinks` configuration variable is set
302
-to 'false' (see gitlink:git-config[1]), symbolic links are checked out
302
+to 'false' (see linkgit:git-config[1]), symbolic links are checked out
303
as plain files, and this command does not modify a recorded file mode
304
from symbolic link to regular file.
305
@@ -309,8 +309,8 @@ The command looks at `core.ignorestat` configuration variable. See
309
310
See Also
311
--------
312
-gitlink:git-config[1],
313
-gitlink:git-add[1]
312
+linkgit:git-config[1],
313
+linkgit:git-add[1]
314
315
316
Author
@@ -323,4 +323,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
323
324
GIT
325
---
326
-Part of the gitlink:git[7] suite
326
+Part of the linkgit:git[7] suite
Documentation/git-update-ref.txt
+1
-1
@@ -90,4 +90,4 @@ Written by Linus Torvalds <torvalds@osdl.org>.
90
91
GIT
92
---
93
-Part of the gitlink:git[7] suite
93
+Part of the linkgit:git[7] suite
Documentation/git-update-server-info.txt
+1
-1
@@ -54,4 +54,4 @@ Documentation by Junio C Hamano.
54
55
GIT
56
---
57
-Part of the gitlink:git[7] suite
57
+Part of the linkgit:git[7] suite
Documentation/git-upload-archive.txt
+1
-1
@@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
34
35
GIT
36
---
37
-Part of the gitlink:git[7] suite
37
+Part of the linkgit:git[7] suite
Documentation/git-upload-pack.txt
+1
-1
@@ -43,4 +43,4 @@ Documentation by Junio C Hamano.
43
44
GIT
45
---
46
-Part of the gitlink:git[7] suite
46
+Part of the linkgit:git[7] suite
Documentation/git-var.txt
+4
-4
@@ -47,9 +47,9 @@ Your sysadmin must hate you!::
47
48
See Also
49
--------
50
-gitlink:git-commit-tree[1]
51
-gitlink:git-tag[1]
52
-gitlink:git-config[1]
50
+linkgit:git-commit-tree[1]
51
+linkgit:git-tag[1]
52
+linkgit:git-config[1]
53
54
Author
55
------
@@ -61,4 +61,4 @@ Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.
61
62
GIT
63
---
64
-Part of the gitlink:git[7] suite
64
+Part of the linkgit:git[7] suite
Documentation/git-verify-pack.txt
+1
-1
@@ -50,4 +50,4 @@ Documentation by Junio C Hamano
50
51
GIT
52
---
53
-Part of the gitlink:git[7] suite
53
+Part of the linkgit:git[7] suite
Documentation/git-verify-tag.txt
+1
-1
@@ -28,4 +28,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
28
29
GIT
30
---
31
-Part of the gitlink:git[7] suite
31
+Part of the linkgit:git[7] suite
Documentation/git-whatchanged.txt
+1
-1
@@ -77,4 +77,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
77
78
GIT
79
---
80
-Part of the gitlink:git[7] suite
80
+Part of the linkgit:git[7] suite
Documentation/git-write-tree.txt
+1
-1
@@ -46,4 +46,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
46
47
GIT
48
---
49
-Part of the gitlink:git[7] suite
49
+Part of the linkgit:git[7] suite
Documentation/git.txt
+10
-10
@@ -28,7 +28,7 @@ link:user-manual.html[Git User's Manual] for a more in-depth
28
introduction.
29
30
The COMMAND is either a name of a Git command (see below) or an alias
31
-as defined in the configuration file (see gitlink:git-config[1]).
31
+as defined in the configuration file (see linkgit:git-config[1]).
32
33
Formatted and hyperlinked version of the latest git
34
documentation can be viewed at
@@ -106,7 +106,7 @@ OPTIONS
106
option will bring up the manual page for that command.
107
+
108
Other options are available to control how the manual page is
109
-displayed. See gitlink:git-help[1] for more information,
109
+displayed. See linkgit:git-help[1] for more information,
110
because 'git --help ...' is converted internally into 'git
111
help ...'.
112
@@ -198,8 +198,8 @@ Low-level commands (plumbing)
198
Although git includes its
199
own porcelain layer, its low-level commands are sufficient to support
200
development of alternative porcelains. Developers of such porcelains
201
-might start by reading about gitlink:git-update-index[1] and
202
-gitlink:git-read-tree[1].
201
+might start by reading about linkgit:git-update-index[1] and
202
+linkgit:git-read-tree[1].
203
204
The interface (input, output, set of options and the semantics)
205
to these low-level commands are meant to be a lot more stable
@@ -331,7 +331,7 @@ HEAD::
331
(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).
332
333
For a more complete list of ways to spell object names, see
334
-"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
334
+"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
335
336
337
File/Directory Structure
@@ -399,7 +399,7 @@ git Commits
399
'GIT_COMMITTER_EMAIL'::
400
'GIT_COMMITTER_DATE'::
401
'EMAIL'::
402
- see gitlink:git-commit-tree[1]
402
+ see linkgit:git-commit-tree[1]
403
404
git Diffs
405
~~~~~~~~~
@@ -439,7 +439,7 @@ other
439
'GIT_MERGE_VERBOSITY'::
440
A number controlling the amount of output shown by
441
the recursive merge strategy. Overrides merge.verbosity.
442
- See gitlink:git-merge[1]
442
+ See linkgit:git-merge[1]
443
444
'GIT_PAGER'::
445
This environment variable overrides `$PAGER`. If it is set
@@ -447,8 +447,8 @@ other
447
a pager.
448
449
'GIT_SSH'::
450
- If this environment variable is set then gitlink:git-fetch[1]
451
- and gitlink:git-push[1] will use this command instead
450
+ If this environment variable is set then linkgit:git-fetch[1]
451
+ and linkgit:git-push[1] will use this command instead
452
of `ssh` when they need to connect to a remote system.
453
The 'GIT_SSH' command will be given exactly two arguments:
454
the 'username@host' (or just 'host') from the URL and the
@@ -554,4 +554,4 @@ contributors on the git-list <git@vger.kernel.org>.
554
555
GIT
556
---
557
-Part of the gitlink:git[7] suite
557
+Part of the linkgit:git[7] suite
Documentation/gitattributes.txt
+5
-5
@@ -238,7 +238,7 @@ When git needs to show you a diff for the path with `diff`
238
attribute set to `jcdiff`, it calls the command you specified
239
with the above configuration, i.e. `j-c-diff`, with 7
240
parameters, just like `GIT_EXTERNAL_DIFF` program is called.
241
-See gitlink:git[7] for details.
241
+See linkgit:git[7] for details.
242
243
244
Defining a custom hunk-header
@@ -400,7 +400,7 @@ Checking whitespace errors
400
401
The `core.whitespace` configuration variable allows you to define what
402
`diff` and `apply` should consider whitespace errors for all paths in
403
-the project (See gitlink:git-config[1]). This attribute gives you finer
403
+the project (See linkgit:git-config[1]). This attribute gives you finer
404
control per path.
405
406
Set::
@@ -481,9 +481,9 @@ Creating an archive
481
If the attribute `export-subst` is set for a file then git will expand
482
several placeholders when adding this file to an archive. The
483
expansion depends on the availability of a commit ID, i.e. if
484
-gitlink:git-archive[1] has been given a tree instead of a commit or a
484
+linkgit:git-archive[1] has been given a tree instead of a commit or a
485
tag then no replacement will be done. The placeholders are the same
486
-as those for the option `--pretty=format:` of gitlink:git-log[1],
486
+as those for the option `--pretty=format:` of linkgit:git-log[1],
487
except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
488
in the file. E.g. the string `$Format:%H$` will be replaced by the
489
commit hash.
@@ -491,4 +491,4 @@ commit hash.
491
492
GIT
493
---
494
-Part of the gitlink:git[7] suite
494
+Part of the linkgit:git[7] suite
Documentation/gitcli.txt
+1
-1
@@ -110,4 +110,4 @@ Documentation by Pierre Habouzit.
110
111
GIT
112
---
113
-Part of the gitlink:git[7] suite
113
+Part of the linkgit:git[7] suite
Documentation/gitignore.txt
+3
-3
@@ -39,10 +39,10 @@ precedence, the last matching pattern decides the outcome):
39
variable 'core.excludesfile'.
40
41
The underlying git plumbing tools, such as
42
-gitlink:git-ls-files[1] and gitlink:git-read-tree[1], read
42
+linkgit:git-ls-files[1] and linkgit:git-read-tree[1], read
43
`gitignore` patterns specified by command-line options, or from
44
files specified by command-line options. Higher-level git
45
-tools, such as gitlink:git-status[1] and gitlink:git-add[1],
45
+tools, such as linkgit:git-status[1] and linkgit:git-add[1],
46
use patterns from the sources specified above.
47
48
Patterns have the following format:
@@ -119,4 +119,4 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.
119
120
GIT
121
---
122
-Part of the gitlink:git[7] suite
122
+Part of the linkgit:git[7] suite
Documentation/gitk.txt
+3
-3
@@ -22,7 +22,7 @@ git repository.
22
OPTIONS
23
-------
24
To control which revisions to shown, the command takes options applicable to
25
-the gitlink:git-rev-list[1] command. This manual page describes only the most
25
+the linkgit:git-rev-list[1] command. This manual page describes only the most
26
frequently used options.
27
28
-n <number>, --max-count=<number>::
@@ -48,7 +48,7 @@ frequently used options.
48
the form "'<from>'..'<to>'" to show all revisions between '<from>' and
49
back to '<to>'. Note, more advanced revision selection can be applied.
50
For a more complete list of ways to spell object names, see
51
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
51
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
52
53
<path>::
54
@@ -98,4 +98,4 @@ Documentation by Junio C Hamano, Jonas Fonseca, and the git-list
98
99
GIT
100
---
101
-Part of the gitlink:git[7] suite
101
+Part of the linkgit:git[7] suite
Documentation/gitmodules.txt
+3
-3
@@ -15,7 +15,7 @@ DESCRIPTION
15
16
The `.gitmodules` file, located in the top-level directory of a git
17
working tree, is a text file with a syntax matching the requirements
18
-of gitlink:git-config[1].
18
+of linkgit:git-config[1].
19
20
The file contains one subsection per submodule, and the subsection value
21
is the name of the submodule. Each submodule section also contains the
@@ -51,7 +51,7 @@ submodules an url is specified which can be used for cloning the submodules.
51
52
SEE ALSO
53
--------
54
-gitlink:git-submodule[1] gitlink:git-config[1]
54
+linkgit:git-submodule[1] linkgit:git-config[1]
55
56
DOCUMENTATION
57
-------------
@@ -59,4 +59,4 @@ Documentation by Lars Hjemli <hjemli@gmail.com>
59
60
GIT
61
---
62
-Part of the gitlink:git[7] suite
62
+Part of the linkgit:git[7] suite
Documentation/glossary.txt
+9
-9
@@ -140,7 +140,7 @@ to point at the new commit.
140
branch's <<def_head_ref,head ref>> from a remote
141
<<def_repository,repository>>, to find out which objects are
142
missing from the local <<def_object_database,object database>>,
143
- and to get them, too. See also gitlink:git-fetch[1].
143
+ and to get them, too. See also linkgit:git-fetch[1].
144
145
[[def_file_system]]file system::
146
Linus Torvalds originally designed git to be a user space file system,
@@ -164,7 +164,7 @@ to point at the new commit.
164
A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a
165
<<def_branch,branch>>. Heads are stored in
166
`$GIT_DIR/refs/heads/`, except when using packed refs. (See
167
- gitlink:git-pack-refs[1].)
167
+ linkgit:git-pack-refs[1].)
168
169
[[def_HEAD]]HEAD::
170
The current <<def_branch,branch>>. In more detail: Your <<def_working_tree,
@@ -282,7 +282,7 @@ This commit is referred to as a "merge commit", or sometimes just a
282
routines that help select changes that add or delete a given text
283
string. With the `--pickaxe-all` option, it can be used to view the full
284
<<def_changeset,changeset>> that introduced or removed, say, a
285
- particular line of text. See gitlink:git-diff[1].
285
+ particular line of text. See linkgit:git-diff[1].
286
287
[[def_plumbing]]plumbing::
288
Cute name for <<def_core_git,core git>>.
@@ -295,7 +295,7 @@ This commit is referred to as a "merge commit", or sometimes just a
295
296
[[def_pull]]pull::
297
Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and
298
- <<def_merge,merge>> it. See also gitlink:git-pull[1].
298
+ <<def_merge,merge>> it. See also linkgit:git-pull[1].
299
300
[[def_push]]push::
301
Pushing a <<def_branch,branch>> means to get the branch's
@@ -333,7 +333,7 @@ This commit is referred to as a "merge commit", or sometimes just a
333
A reflog shows the local "history" of a ref. In other words,
334
it can tell you what the 3rd last revision in _this_ repository
335
was, and what was the current state in _this_ repository,
336
- yesterday 9:14pm. See gitlink:git-reflog[1] for details.
336
+ yesterday 9:14pm. See linkgit:git-reflog[1] for details.
337
338
[[def_refspec]]refspec::
339
A "refspec" is used by <<def_fetch,fetch>> and
@@ -346,7 +346,7 @@ This commit is referred to as a "merge commit", or sometimes just a
346
it as my origin branch head". And `git push
347
$URL refs/heads/master:refs/heads/to-upstream` means "publish my
348
master branch head as to-upstream branch at $URL". See also
349
- gitlink:git-push[1].
349
+ linkgit:git-push[1].
350
351
[[def_repository]]repository::
352
A collection of <<def_ref,refs>> together with an
@@ -383,15 +383,15 @@ This commit is referred to as a "merge commit", or sometimes just a
383
object>>). This is sometimes useful when you are interested only in the
384
recent history of a project even though the real history recorded in the
385
upstream is much larger. A shallow repository
386
- is created by giving the `--depth` option to gitlink:git-clone[1], and
387
- its history can be later deepened with gitlink:git-fetch[1].
386
+ is created by giving the `--depth` option to linkgit:git-clone[1], and
387
+ its history can be later deepened with linkgit:git-fetch[1].
388
389
[[def_symref]]symref::
390
Symbolic reference: instead of containing the <<def_SHA1,SHA1>>
391
id itself, it is of the format 'ref: refs/some/thing' and when
392
referenced, it recursively dereferences to this reference.
393
'<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic
394
- references are manipulated with the gitlink:git-symbolic-ref[1]
394
+ references are manipulated with the linkgit:git-symbolic-ref[1]
395
command.
396
397
[[def_tag]]tag::
Documentation/repository-layout.txt
+5
-5
@@ -19,7 +19,7 @@ trees this way, for example. A repository with this kind of
19
incomplete object store is not suitable to be published to the
20
outside world but sometimes useful for private repository.
21
. You also could have an incomplete but locally usable repository
22
-by cloning shallowly. See gitlink:git-clone[1].
22
+by cloning shallowly. See linkgit:git-clone[1].
23
. You can be using `objects/info/alternates` mechanism, or
24
`$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
25
objects from other object stores. A repository with this kind
@@ -89,7 +89,7 @@ refs/remotes/`name`::
89
packed-refs::
90
records the same information as refs/heads/, refs/tags/,
91
and friends record in a more efficient way. See
92
- gitlink:git-pack-refs[1].
92
+ linkgit:git-pack-refs[1].
93
94
HEAD::
95
A symref (see glossary) to the `refs/heads/` namespace
@@ -106,7 +106,7 @@ HEAD::
106
HEAD can also record a specific commit directly, instead of
107
being a symref to point at the current branch. Such a state
108
is often called 'detached HEAD', and almost all commands work
109
-identically as normal. See gitlink:git-checkout[1] for
109
+identically as normal. See linkgit:git-checkout[1] for
110
details.
111
112
branches::
@@ -155,7 +155,7 @@ info/exclude::
155
exclude pattern list. `.gitignore` is the per-directory
156
ignore file. `git status`, `git add`, `git rm` and `git
157
clean` look at it but the core git commands do not look
158
- at it. See also: gitlink:gitignore[5].
158
+ at it. See also: linkgit:gitignore[5].
159
160
remotes::
161
Stores shorthands to be used to give URL and default
@@ -176,4 +176,4 @@ logs/refs/tags/`name`::
176
shallow::
177
This is similar to `info/grafts` but is internally used
178
and maintained by shallow clone mechanism. See `--depth`
179
- option to gitlink:git-clone[1] and gitlink:git-fetch[1].
179
+ option to linkgit:git-clone[1] and linkgit:git-fetch[1].
Documentation/tutorial-2.txt
+1
-1
@@ -172,7 +172,7 @@ merge, with the parent references pointing to the heads of the merged
172
branches.
173
174
Besides blobs, trees, and commits, the only remaining type of object
175
-is a "tag", which we won't discuss here; refer to gitlink:git-tag[1]
175
+is a "tag", which we won't discuss here; refer to linkgit:git-tag[1]
176
for details.
177
178
So now we know how git uses the object database to represent a
Documentation/tutorial.txt
+12
-12
@@ -47,7 +47,7 @@ You've now initialized the working directory--you may notice a new
47
directory created, named ".git".
48
49
Next, tell git to take a snapshot of the contents of all files under the
50
-current directory (note the '.'), with gitlink:git-add[1]:
50
+current directory (note the '.'), with linkgit:git-add[1]:
51
52
------------------------------------------------
53
$ git add .
@@ -55,7 +55,7 @@ $ git add .
55
56
This snapshot is now stored in a temporary staging area which git calls
57
the "index". You can permanently store the contents of the index in the
58
-repository with gitlink:git-commit[1]:
58
+repository with linkgit:git-commit[1]:
59
60
------------------------------------------------
61
$ git commit
@@ -74,15 +74,15 @@ $ git add file1 file2 file3
74
------------------------------------------------
75
76
You are now ready to commit. You can see what is about to be committed
77
-using gitlink:git-diff[1] with the --cached option:
77
+using linkgit:git-diff[1] with the --cached option:
78
79
------------------------------------------------
80
$ git diff --cached
81
------------------------------------------------
82
83
-(Without --cached, gitlink:git-diff[1] will show you any changes that
83
+(Without --cached, linkgit:git-diff[1] will show you any changes that
84
you've made but not yet added to the index.) You can also get a brief
85
-summary of the situation with gitlink:git-status[1]:
85
+summary of the situation with linkgit:git-status[1]:
86
87
------------------------------------------------
88
$ git status
@@ -358,7 +358,7 @@ $ git config --get remote.origin.url
358
-------------------------------------
359
360
(The complete configuration created by git-clone is visible using
361
-"git config -l", and the gitlink:git-config[1] man page
361
+"git config -l", and the linkgit:git-config[1] man page
362
explains the meaning of each option.)
363
364
Git also keeps a pristine copy of Alice's master branch under the
@@ -377,10 +377,10 @@ $ git clone alice.org:/home/alice/project myrepo
377
-------------------------------------
378
379
Alternatively, git has a native protocol, or can use rsync or http;
380
-see gitlink:git-pull[1] for details.
380
+see linkgit:git-pull[1] for details.
381
382
Git can also be used in a CVS-like mode, with a central repository
383
-that various users push changes to; see gitlink:git-push[1] and
383
+that various users push changes to; see linkgit:git-push[1] and
384
link:cvs-migration.html[git for CVS users].
385
386
Exploring history
@@ -442,7 +442,7 @@ $ git-tag v2.5 1b2e1d63ff
442
you can refer to 1b2e1d63ff by the name "v2.5". If you intend to
443
share this name with other people (for example, to identify a release
444
version), you should create a "tag" object, and perhaps sign it; see
445
-gitlink:git-tag[1] for details.
445
+linkgit:git-tag[1] for details.
446
447
Any git command that needs to know a commit can take any of these
448
names. For example:
@@ -461,7 +461,7 @@ this branch. If this branch is the only branch containing those
461
commits, they will be lost. Also, don't use "git reset" on a
462
publicly-visible branch that other developers pull from, as it will
463
force needless merges on other developers to clean up the history.
464
-If you need to undo changes that you have pushed, use gitlink:git-revert[1]
464
+If you need to undo changes that you have pushed, use linkgit:git-revert[1]
465
instead.
466
467
The git grep command can search for strings in any version of your
@@ -567,12 +567,12 @@ need to make the most of git.
567
If you don't want to continue with that right away, a few other
568
digressions that may be interesting at this point are:
569
570
- * gitlink:git-format-patch[1], gitlink:git-am[1]: These convert
570
+ * linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
571
series of git commits into emailed patches, and vice versa,
572
useful for projects such as the linux kernel which rely heavily
573
on emailed patches.
574
575
- * gitlink:git-bisect[1]: When there is a regression in your
575
+ * linkgit:git-bisect[1]: When there is a regression in your
576
project, one way to track down the bug is by searching through
577
the history to find the exact commit that's to blame. Git bisect
578
can help you perform a binary search for that commit. It is
Documentation/urls.txt
+1
-1
@@ -38,7 +38,7 @@ To sync with a local directory, you can use:
38
39
ifndef::git-clone[]
40
They are mostly equivalent, except when cloning. See
41
-gitlink:git-clone[1] for details.
41
+linkgit:git-clone[1] for details.
42
endif::git-clone[]
43
44
ifdef::git-clone[]
Documentation/user-manual.conf
+1
-1
@@ -7,7 +7,7 @@ startsb=[
7
endsb=]
8
tilde=~
9
10
-[gitlink-inlinemacro]
10
+[linkgit-inlinemacro]
11
<ulink url="{target}.html">{target}{0?({0})}</ulink>
12
13
ifdef::backend-docbook[]
Documentation/user-manual.txt
+123
-123
@@ -42,7 +42,7 @@ How to get a git repository
42
It will be useful to have a git repository to experiment with as you
43
read this manual.
44
45
-The best way to get one is by using the gitlink:git-clone[1] command to
45
+The best way to get one is by using the linkgit:git-clone[1] command to
46
download a copy of an existing repository. If you don't already have a
47
project in mind, here are some interesting examples:
48
@@ -79,7 +79,7 @@ merge and diverge.
79
80
A single git repository can track development on multiple branches. It
81
does this by keeping a list of <<def_head,heads>> which reference the
82
-latest commit on each branch; the gitlink:git-branch[1] command shows
82
+latest commit on each branch; the linkgit:git-branch[1] command shows
83
you the list of branch heads:
84
85
------------------------------------------------
@@ -93,7 +93,7 @@ the project referred to by that branch head.
93
94
Most projects also use <<def_tag,tags>>. Tags, like heads, are
95
references into the project's history, and can be listed using the
96
-gitlink:git-tag[1] command:
96
+linkgit:git-tag[1] command:
97
98
------------------------------------------------
99
$ git tag -l
@@ -113,14 +113,14 @@ Tags are expected to always point at the same version of a project,
113
while heads are expected to advance as development progresses.
114
115
Create a new branch head pointing to one of these versions and check it
116
-out using gitlink:git-checkout[1]:
116
+out using linkgit:git-checkout[1]:
117
118
------------------------------------------------
119
$ git checkout -b new v2.6.13
120
------------------------------------------------
121
122
The working directory then reflects the contents that the project had
123
-when it was tagged v2.6.13, and gitlink:git-branch[1] shows two
123
+when it was tagged v2.6.13, and linkgit:git-branch[1] shows two
124
branches, with an asterisk marking the currently checked-out branch:
125
126
------------------------------------------------
@@ -146,7 +146,7 @@ Understanding History: Commits
146
------------------------------
147
148
Every change in the history of a project is represented by a commit.
149
-The gitlink:git-show[1] command shows the most recent commit on the
149
+The linkgit:git-show[1] command shows the most recent commit on the
150
current branch:
151
152
------------------------------------------------
@@ -208,7 +208,7 @@ representing a merge can therefore have more than one parent, with
208
each parent representing the most recent commit on one of the lines
209
of development leading to that point.
210
211
-The best way to see how this works is using the gitlink:gitk[1]
211
+The best way to see how this works is using the linkgit:gitk[1]
212
command; running gitk now on a git repository and looking for merge
213
commits will help understand how the git organizes history.
214
@@ -335,7 +335,7 @@ The "master" branch that was created at the time you cloned is a copy
335
of the HEAD in the repository that you cloned from. That repository
336
may also have had other branches, though, and your local repository
337
keeps branches which track each of those remote branches, which you
338
-can view using the "-r" option to gitlink:git-branch[1]:
338
+can view using the "-r" option to linkgit:git-branch[1]:
339
340
------------------------------------------------
341
$ git branch -r
@@ -378,7 +378,7 @@ exists a tag and a branch with the same name.
378
(Newly created refs are actually stored in the .git/refs directory,
379
under the path given by their name. However, for efficiency reasons
380
they may also be packed together in a single file; see
381
-gitlink:git-pack-refs[1]).
381
+linkgit:git-pack-refs[1]).
382
383
As another useful shortcut, the "HEAD" of a repository can be referred
384
to just using the name of that repository. So, for example, "origin"
@@ -387,7 +387,7 @@ is usually a shortcut for the HEAD branch in the repository "origin".
387
For the complete list of paths which git checks for references, and
388
the order it uses to decide which to choose when there are multiple
389
references with the same shorthand name, see the "SPECIFYING
390
-REVISIONS" section of gitlink:git-rev-parse[1].
390
+REVISIONS" section of linkgit:git-rev-parse[1].
391
392
[[Updating-a-repository-with-git-fetch]]
393
Updating a repository with git fetch
@@ -407,7 +407,7 @@ Fetching branches from other repositories
407
-----------------------------------------
408
409
You can also track branches from repositories other than the one you
410
-cloned from, using gitlink:git-remote[1]:
410
+cloned from, using linkgit:git-remote[1]:
411
412
-------------------------------------------------
413
$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
@@ -443,7 +443,7 @@ $ cat .git/config
443
This is what causes git to track the remote's branches; you may modify
444
or delete these configuration options by editing .git/config with a
445
text editor. (See the "CONFIGURATION FILE" section of
446
-gitlink:git-config[1] for details.)
446
+linkgit:git-config[1] for details.)
447
448
[[exploring-git-history]]
449
Exploring git history
@@ -468,7 +468,7 @@ Suppose version 2.6.18 of your project worked, but the version at
468
"master" crashes. Sometimes the best way to find the cause of such a
469
regression is to perform a brute-force search through the project's
470
history to find the particular commit that caused the problem. The
471
-gitlink:git-bisect[1] command can help you do this:
471
+linkgit:git-bisect[1] command can help you do this:
472
473
-------------------------------------------------
474
$ git bisect start
@@ -497,7 +497,7 @@ half each time.
497
498
After about 13 tests (in this case), it will output the commit id of
499
the guilty commit. You can then examine the commit with
500
-gitlink:git-show[1], find out who wrote it, and mail them your bug
500
+linkgit:git-show[1], find out who wrote it, and mail them your bug
501
report with the commit id. Finally, run
502
503
-------------------------------------------------
@@ -543,7 +543,7 @@ We have seen several ways of naming commits already:
543
- HEAD: refers to the head of the current branch
544
545
There are many more; see the "SPECIFYING REVISIONS" section of the
546
-gitlink:git-rev-parse[1] man page for the complete list of ways to
546
+linkgit:git-rev-parse[1] man page for the complete list of ways to
547
name revisions. Some examples:
548
549
-------------------------------------------------
@@ -584,7 +584,7 @@ When we discuss merges we'll also see the special name MERGE_HEAD,
584
which refers to the other branch that we're merging in to the current
585
branch.
586
587
-The gitlink:git-rev-parse[1] command is a low-level command that is
587
+The linkgit:git-rev-parse[1] command is a low-level command that is
588
occasionally useful for translating some name for a commit to the object
589
name for that commit:
590
@@ -608,14 +608,14 @@ You can use stable-1 to refer to the commit 1b2e1d63ff.
608
609
This creates a "lightweight" tag. If you would also like to include a
610
comment with the tag, and possibly sign it cryptographically, then you
611
-should create a tag object instead; see the gitlink:git-tag[1] man page
611
+should create a tag object instead; see the linkgit:git-tag[1] man page
612
for details.
613
614
[[browsing-revisions]]
615
Browsing revisions
616
------------------
617
618
-The gitlink:git-log[1] command can show lists of commits. On its
618
+The linkgit:git-log[1] command can show lists of commits. On its
619
own, it shows all commits reachable from the parent commit; but you
620
can also make more specific requests:
621
@@ -645,7 +645,7 @@ You can also ask git log to show patches:
645
$ git log -p
646
-------------------------------------------------
647
648
-See the "--pretty" option in the gitlink:git-log[1] man page for more
648
+See the "--pretty" option in the linkgit:git-log[1] man page for more
649
display options.
650
651
Note that git log starts with the most recent commit and works
@@ -658,7 +658,7 @@ Generating diffs
658
----------------
659
660
You can generate diffs between any two versions using
661
-gitlink:git-diff[1]:
661
+linkgit:git-diff[1]:
662
663
-------------------------------------------------
664
$ git diff master..test
@@ -673,7 +673,7 @@ $ git diff master...test
673
-------------------------------------------------
674
675
Sometimes what you want instead is a set of patches; for this you can
676
-use gitlink:git-format-patch[1]:
676
+use linkgit:git-format-patch[1]:
677
678
-------------------------------------------------
679
$ git format-patch master..test
@@ -714,7 +714,7 @@ $ git log --pretty=oneline origin..mybranch | wc -l
714
-------------------------------------------------
715
716
Alternatively, you may often see this sort of thing done with the
717
-lower-level command gitlink:git-rev-list[1], which just lists the SHA1's
717
+lower-level command linkgit:git-rev-list[1], which just lists the SHA1's
718
of all the given commits:
719
720
-------------------------------------------------
@@ -772,7 +772,7 @@ You could just visually inspect the commits since e05db0fd:
772
$ gitk e05db0fd..
773
-------------------------------------------------
774
775
-Or you can use gitlink:git-name-rev[1], which will give the commit a
775
+Or you can use linkgit:git-name-rev[1], which will give the commit a
776
name based on any tag it finds pointing to one of the commit's
777
descendants:
778
@@ -781,7 +781,7 @@ $ git name-rev --tags e05db0fd
781
e05db0fd tags/v1.5.0-rc1^0~23
782
-------------------------------------------------
783
784
-The gitlink:git-describe[1] command does the opposite, naming the
784
+The linkgit:git-describe[1] command does the opposite, naming the
785
revision using a tag on which the given commit is based:
786
787
-------------------------------------------------
@@ -793,7 +793,7 @@ but that may sometimes help you guess which tags might come after the
793
given commit.
794
795
If you just want to verify whether a given tagged version contains a
796
-given commit, you could use gitlink:git-merge-base[1]:
796
+given commit, you could use linkgit:git-merge-base[1]:
797
798
-------------------------------------------------
799
$ git merge-base e05db0fd v1.5.0-rc1
@@ -814,7 +814,7 @@ $ git log v1.5.0-rc1..e05db0fd
814
will produce empty output if and only if v1.5.0-rc1 includes e05db0fd,
815
because it outputs only commits that are not reachable from v1.5.0-rc1.
816
817
-As yet another alternative, the gitlink:git-show-branch[1] command lists
817
+As yet another alternative, the linkgit:git-show-branch[1] command lists
818
the commits reachable from its arguments with a display on the left-hand
819
side that indicates which arguments that commit is reachable from. So,
820
you can run something like
@@ -847,7 +847,7 @@ Suppose you would like to see all the commits reachable from the branch
847
head named "master" but not from any other head in your repository.
848
849
We can list all the heads in this repository with
850
-gitlink:git-show-ref[1]:
850
+linkgit:git-show-ref[1]:
851
852
-------------------------------------------------
853
$ git show-ref --heads
@@ -884,14 +884,14 @@ commits reachable from some head but not from any tag in the repository:
884
$ gitk $( git show-ref --heads ) --not $( git show-ref --tags )
885
-------------------------------------------------
886
887
-(See gitlink:git-rev-parse[1] for explanations of commit-selecting
887
+(See linkgit:git-rev-parse[1] for explanations of commit-selecting
888
syntax such as `--not`.)
889
890
[[making-a-release]]
891
Creating a changelog and tarball for a software release
892
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
893
894
-The gitlink:git-archive[1] command can create a tar or zip archive from
894
+The linkgit:git-archive[1] command can create a tar or zip archive from
895
any version of a project; for example:
896
897
-------------------------------------------------
@@ -944,8 +944,8 @@ $ git log --raw --abbrev=40 --pretty=oneline |
944
-------------------------------------------------
945
946
Figuring out why this works is left as an exercise to the (advanced)
947
-student. The gitlink:git-log[1], gitlink:git-diff-tree[1], and
948
-gitlink:git-hash-object[1] man pages may prove helpful.
947
+student. The linkgit:git-log[1], linkgit:git-diff-tree[1], and
948
+linkgit:git-hash-object[1] man pages may prove helpful.
949
950
[[Developing-with-git]]
951
Developing with git
@@ -965,7 +965,7 @@ file named .gitconfig in your home directory:
965
email = you@yourdomain.example.com
966
------------------------------------------------
967
968
-(See the "CONFIGURATION FILE" section of gitlink:git-config[1] for
968
+(See the "CONFIGURATION FILE" section of linkgit:git-config[1] for
969
details on the configuration file.)
970
971
@@ -1088,7 +1088,7 @@ $ git diff HEAD # difference between HEAD and working tree; what
1088
$ git status # a brief per-file summary of the above.
1089
-------------------------------------------------
1090
1091
-You can also use gitlink:git-gui[1] to create commits, view changes in
1091
+You can also use linkgit:git-gui[1] to create commits, view changes in
1092
the index and the working tree files, and individually select diff hunks
1093
for inclusion in the index (by right-clicking on the diff hunk and
1094
choosing "Stage Hunk For Commit").
@@ -1131,7 +1131,7 @@ foo.txt
1131
*.[oa]
1132
-------------------------------------------------
1133
1134
-See gitlink:gitignore[5] for a detailed explanation of the syntax. You can
1134
+See linkgit:gitignore[5] for a detailed explanation of the syntax. You can
1135
also place .gitignore files in other directories in your working tree, and they
1136
will apply to those directories and their subdirectories. The `.gitignore`
1137
files can be added to your repository like any other files (just run `git add
@@ -1144,14 +1144,14 @@ If you wish the exclude patterns to affect only certain repositories
1144
them in a file in your repository named .git/info/exclude, or in any file
1145
specified by the `core.excludesfile` configuration variable. Some git
1146
commands can also take exclude patterns directly on the command line.
1147
-See gitlink:gitignore[5] for the details.
1147
+See linkgit:gitignore[5] for the details.
1148
1149
[[how-to-merge]]
1150
How to merge
1151
------------
1152
1153
You can rejoin two diverging branches of development using
1154
-gitlink:git-merge[1]:
1154
+linkgit:git-merge[1]:
1155
1156
-------------------------------------------------
1157
$ git merge branchname
@@ -1188,7 +1188,7 @@ the working tree in a special state that gives you all the
1188
information you need to help resolve the merge.
1189
1190
Files with conflicts are marked specially in the index, so until you
1191
-resolve the problem and update the index, gitlink:git-commit[1] will
1191
+resolve the problem and update the index, linkgit:git-commit[1] will
1192
fail:
1193
1194
-------------------------------------------------
@@ -1196,7 +1196,7 @@ $ git commit
1196
file.txt: needs merge
1197
-------------------------------------------------
1198
1199
-Also, gitlink:git-status[1] will list those files as "unmerged", and the
1199
+Also, linkgit:git-status[1] will list those files as "unmerged", and the
1200
files with conflicts will have conflict markers added, like this:
1201
1202
-------------------------------------------------
@@ -1227,7 +1227,7 @@ Getting conflict-resolution help during a merge
1227
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1228
1229
All of the changes that git was able to merge automatically are
1230
-already added to the index file, so gitlink:git-diff[1] shows only
1230
+already added to the index file, so linkgit:git-diff[1] shows only
1231
the conflicts. It uses an unusual syntax:
1232
1233
-------------------------------------------------
@@ -1262,7 +1262,7 @@ $ git show :3:file.txt # the version from MERGE_HEAD, but including any
1262
1263
Since the stage 2 and stage 3 versions have already been updated with
1264
nonconflicting changes, the only remaining differences between them are
1265
-the important ones; thus gitlink:git-diff[1] can use the information in
1265
+the important ones; thus linkgit:git-diff[1] can use the information in
1266
the index to show only those conflicts.
1267
1268
The diff above shows the differences between the working-tree version of
@@ -1271,7 +1271,7 @@ each line by a single "+" or "-", it now uses two columns: the first
1271
column is used for differences between the first parent and the working
1272
directory copy, and the second for differences between the second parent
1273
and the working directory copy. (See the "COMBINED DIFF FORMAT" section
1274
-of gitlink:git-diff-files[1] for a details of the format.)
1274
+of linkgit:git-diff-files[1] for a details of the format.)
1275
1276
After resolving the conflict in the obvious way (but before updating the
1277
index), the diff will look like:
@@ -1304,7 +1304,7 @@ $ git diff -3 file.txt # diff against stage 3
1304
$ git diff --theirs file.txt # same as the above.
1305
-------------------------------------------------
1306
1307
-The gitlink:git-log[1] and gitk[1] commands also provide special help
1307
+The linkgit:git-log[1] and gitk[1] commands also provide special help
1308
for merges:
1309
1310
-------------------------------------------------
@@ -1315,7 +1315,7 @@ $ gitk --merge
1315
These will display all commits which exist only on HEAD or on
1316
MERGE_HEAD, and which touch an unmerged file.
1317
1318
-You may also use gitlink:git-mergetool[1], which lets you merge the
1318
+You may also use linkgit:git-mergetool[1], which lets you merge the
1319
unmerged files using external tools such as emacs or kdiff3.
1320
1321
Each time you resolve the conflicts in a file and update the index:
@@ -1394,7 +1394,7 @@ Fixing a mistake with a new commit
1394
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1395
1396
Creating a new commit that reverts an earlier change is very easy;
1397
-just pass the gitlink:git-revert[1] command a reference to the bad
1397
+just pass the linkgit:git-revert[1] command a reference to the bad
1398
commit; for example, to revert the most recent commit:
1399
1400
-------------------------------------------------
@@ -1437,7 +1437,7 @@ which will replace the old commit by a new commit incorporating your
1437
changes, giving you a chance to edit the old commit message first.
1438
1439
Again, you should never do this to a commit that may already have
1440
-been merged into another branch; use gitlink:git-revert[1] instead in
1440
+been merged into another branch; use linkgit:git-revert[1] instead in
1441
that case.
1442
1443
It is also possible to replace commits further back in the history, but
@@ -1450,7 +1450,7 @@ Checking out an old version of a file
1450
1451
In the process of undoing a previous bad change, you may find it
1452
useful to check out an older version of a particular file using
1453
-gitlink:git-checkout[1]. We've used git checkout before to switch
1453
+linkgit:git-checkout[1]. We've used git checkout before to switch
1454
branches, but it has quite different behavior if it is given a path
1455
name: the command
1456
@@ -1463,7 +1463,7 @@ also updates the index to match. It does not change branches.
1463
1464
If you just want to look at an old version of the file, without
1465
modifying the working directory, you can do that with
1466
-gitlink:git-show[1]:
1466
+linkgit:git-show[1]:
1467
1468
-------------------------------------------------
1469
$ git show HEAD^:path/to/file
@@ -1477,7 +1477,7 @@ Temporarily setting aside work in progress
1477
1478
While you are in the middle of working on something complicated, you
1479
find an unrelated but obvious and trivial bug. You would like to fix it
1480
-before continuing. You can use gitlink:git-stash[1] to save the current
1480
+before continuing. You can use linkgit:git-stash[1] to save the current
1481
state of your work, and after fixing the bug (or, optionally after doing
1482
so on a different branch and then coming back), unstash the
1483
work-in-progress changes.
@@ -1511,7 +1511,7 @@ On large repositories, git depends on compression to keep the history
1511
information from taking up too much space on disk or in memory.
1512
1513
This compression is not performed automatically. Therefore you
1514
-should occasionally run gitlink:git-gc[1]:
1514
+should occasionally run linkgit:git-gc[1]:
1515
1516
-------------------------------------------------
1517
$ git gc
@@ -1529,7 +1529,7 @@ Ensuring reliability
1529
Checking the repository for corruption
1530
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1531
1532
-The gitlink:git-fsck[1] command runs a number of self-consistency checks
1532
+The linkgit:git-fsck[1] command runs a number of self-consistency checks
1533
on the repository, and reports on any problems. This may take some
1534
time. The most common warning by far is about "dangling" objects:
1535
@@ -1549,8 +1549,8 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
1549
Dangling objects are not a problem. At worst they may take up a little
1550
extra disk space. They can sometimes provide a last-resort method for
1551
recovering lost work--see <<dangling-objects>> for details. However, if
1552
-you wish, you can remove them with gitlink:git-prune[1] or the `--prune`
1553
-option to gitlink:git-gc[1]:
1552
+you wish, you can remove them with linkgit:git-prune[1] or the `--prune`
1553
+option to linkgit:git-gc[1]:
1554
1555
-------------------------------------------------
1556
$ git gc --prune
@@ -1560,7 +1560,7 @@ This may be time-consuming. Unlike most other git operations (including
1560
git-gc when run without any options), it is not safe to prune while
1561
other git operations are in progress in the same repository.
1562
1563
-If gitlink:git-fsck[1] complains about sha1 mismatches or missing
1563
+If linkgit:git-fsck[1] complains about sha1 mismatches or missing
1564
objects, you may have a much more serious problem; your best option is
1565
probably restoring from backups. See
1566
<<recovering-from-repository-corruption>> for a detailed discussion.
@@ -1573,7 +1573,7 @@ Recovering lost changes
1573
Reflogs
1574
^^^^^^^
1575
1576
-Say you modify a branch with `gitlink:git-reset[1] --hard`, and then
1576
+Say you modify a branch with `linkgit:git-reset[1] --hard`, and then
1577
realize that the branch was the only reference you had to that point in
1578
history.
1579
@@ -1608,9 +1608,9 @@ pointed to one week ago. This allows you to see the history of what
1608
you've checked out.
1609
1610
The reflogs are kept by default for 30 days, after which they may be
1611
-pruned. See gitlink:git-reflog[1] and gitlink:git-gc[1] to learn
1611
+pruned. See linkgit:git-reflog[1] and linkgit:git-gc[1] to learn
1612
how to control this pruning, and see the "SPECIFYING REVISIONS"
1613
-section of gitlink:git-rev-parse[1] for details.
1613
+section of linkgit:git-rev-parse[1] for details.
1614
1615
Note that the reflog history is very different from normal git history.
1616
While normal history is shared by every repository that works on the
@@ -1675,7 +1675,7 @@ may wish to check the original repository for updates and merge them
1675
into your own work.
1676
1677
We have already seen <<Updating-a-repository-with-git-fetch,how to
1678
-keep remote tracking branches up to date>> with gitlink:git-fetch[1],
1678
+keep remote tracking branches up to date>> with linkgit:git-fetch[1],
1679
and how to merge two branches. So you can merge in changes from the
1680
original repository's master branch with:
1681
@@ -1684,7 +1684,7 @@ $ git fetch
1684
$ git merge origin/master
1685
-------------------------------------------------
1686
1687
-However, the gitlink:git-pull[1] command provides a way to do this in
1687
+However, the linkgit:git-pull[1] command provides a way to do this in
1688
one step:
1689
1690
-------------------------------------------------
@@ -1702,8 +1702,8 @@ $ git pull
1702
More generally, a branch that is created from a remote branch will pull
1703
by default from that branch. See the descriptions of the
1704
branch.<name>.remote and branch.<name>.merge options in
1705
-gitlink:git-config[1], and the discussion of the `--track` option in
1706
-gitlink:git-checkout[1], to learn how to control these defaults.
1705
+linkgit:git-config[1], and the discussion of the `--track` option in
1706
+linkgit:git-checkout[1], to learn how to control these defaults.
1707
1708
In addition to saving you keystrokes, "git pull" also helps you by
1709
producing a default commit message documenting the branch and
@@ -1731,7 +1731,7 @@ Submitting patches to a project
1731
If you just have a few changes, the simplest way to submit them may
1732
just be to send them as patches in email:
1733
1734
-First, use gitlink:git-format-patch[1]; for example:
1734
+First, use linkgit:git-format-patch[1]; for example:
1735
1736
-------------------------------------------------
1737
$ git format-patch origin
@@ -1742,7 +1742,7 @@ for each patch in the current branch but not in origin/HEAD.
1742
1743
You can then import these into your mail client and send them by
1744
hand. However, if you have a lot to send at once, you may prefer to
1745
-use the gitlink:git-send-email[1] script to automate the process.
1745
+use the linkgit:git-send-email[1] script to automate the process.
1746
Consult the mailing list for your project first to determine how they
1747
prefer such patches be handled.
1748
@@ -1750,7 +1750,7 @@ prefer such patches be handled.
1750
Importing patches to a project
1751
------------------------------
1752
1753
-Git also provides a tool called gitlink:git-am[1] (am stands for
1753
+Git also provides a tool called linkgit:git-am[1] (am stands for
1754
"apply mailbox"), for importing such an emailed series of patches.
1755
Just save all of the patch-containing messages, in order, into a
1756
single mailbox file, say "patches.mbox", then run
@@ -1785,7 +1785,7 @@ Public git repositories
1785
1786
Another way to submit changes to a project is to tell the maintainer
1787
of that project to pull the changes from your repository using
1788
-gitlink:git-pull[1]. In the section "<<getting-updates-with-git-pull,
1788
+linkgit:git-pull[1]. In the section "<<getting-updates-with-git-pull,
1789
Getting updates with git pull>>" we described this as a way to get
1790
updates from the "main" repository, but it works just as well in the
1791
other direction.
@@ -1866,14 +1866,14 @@ at. You can then skip to the section
1866
"<<pushing-changes-to-a-public-repository,Pushing changes to a public
1867
repository>>", below.
1868
1869
-Otherwise, all you need to do is start gitlink:git-daemon[1]; it will
1869
+Otherwise, all you need to do is start linkgit:git-daemon[1]; it will
1870
listen on port 9418. By default, it will allow access to any directory
1871
that looks like a git directory and contains the magic file
1872
git-daemon-export-ok. Passing some directory paths as git-daemon
1873
arguments will further restrict the exports to those paths.
1874
1875
You can also run git-daemon as an inetd service; see the
1876
-gitlink:git-daemon[1] man page for details. (See especially the
1876
+linkgit:git-daemon[1] man page for details. (See especially the
1877
examples section.)
1878
1879
[[exporting-via-http]]
@@ -1895,7 +1895,7 @@ $ chmod a+x hooks/post-update
1895
-------------------------------------------------
1896
1897
(For an explanation of the last two lines, see
1898
-gitlink:git-update-server-info[1], and the documentation
1898
+linkgit:git-update-server-info[1], and the documentation
1899
link:hooks.html[Hooks used by git].)
1900
1901
Advertise the URL of proj.git. Anybody else should then be able to
@@ -1920,7 +1920,7 @@ maintainers to fetch your latest changes, but they do not allow write
1920
access, which you will need to update the public repository with the
1921
latest changes created in your private repository.
1922
1923
-The simplest way to do this is using gitlink:git-push[1] and ssh; to
1923
+The simplest way to do this is using linkgit:git-push[1] and ssh; to
1924
update the remote branch named "master" with the latest state of your
1925
branch named "master", run
1926
@@ -1961,7 +1961,7 @@ $ git push public-repo master
1961
-------------------------------------------------
1962
1963
See the explanations of the remote.<name>.url, branch.<name>.remote,
1964
-and remote.<name>.push options in gitlink:git-config[1] for
1964
+and remote.<name>.push options in linkgit:git-config[1] for
1965
details.
1966
1967
[[forcing-push]]
@@ -2083,14 +2083,14 @@ $ cd work
2083
-------------------------------------------------
2084
2085
Linus's tree will be stored in the remote branch named origin/master,
2086
-and can be updated using gitlink:git-fetch[1]; you can track other
2087
-public trees using gitlink:git-remote[1] to set up a "remote" and
2088
-gitlink:git-fetch[1] to keep them up-to-date; see
2086
+and can be updated using linkgit:git-fetch[1]; you can track other
2087
+public trees using linkgit:git-remote[1] to set up a "remote" and
2088
+linkgit:git-fetch[1] to keep them up-to-date; see
2089
<<repositories-and-branches>>.
2090
2091
Now create the branches in which you are going to work; these start out
2092
at the current tip of origin/master branch, and should be set up (using
2093
-the --track option to gitlink:git-branch[1]) to merge changes in from
2093
+the --track option to linkgit:git-branch[1]) to merge changes in from
2094
Linus by default.
2095
2096
-------------------------------------------------
@@ -2098,7 +2098,7 @@ $ git branch --track test origin/master
2098
$ git branch --track release origin/master
2099
-------------------------------------------------
2100
2101
-These can be easily kept up to date using gitlink:git-pull[1].
2101
+These can be easily kept up to date using linkgit:git-pull[1].
2102
2103
-------------------------------------------------
2104
$ git checkout test && git pull
@@ -2113,7 +2113,7 @@ doing this capriciously in the "release" branch, as these noisy commits
2113
will become part of the permanent history when you ask Linus to pull
2114
from the release branch.
2115
2116
-A few configuration variables (see gitlink:git-config[1]) can
2116
+A few configuration variables (see linkgit:git-config[1]) can
2117
make it easy to push both branches to your public tree. (See
2118
<<setting-up-a-public-repository>>.)
2119
@@ -2127,7 +2127,7 @@ EOF
2127
-------------------------------------------------
2128
2129
Then you can push both the test and release trees using
2130
-gitlink:git-push[1]:
2130
+linkgit:git-push[1]:
2131
2132
-------------------------------------------------
2133
$ git push mytree
@@ -2440,7 +2440,7 @@ the result would create a new merge commit, like this:
2440
2441
However, if you prefer to keep the history in mywork a simple series of
2442
commits without any merges, you may instead choose to use
2443
-gitlink:git-rebase[1]:
2443
+linkgit:git-rebase[1]:
2444
2445
-------------------------------------------------
2446
$ git checkout mywork
@@ -2491,7 +2491,7 @@ $ git commit --amend
2491
which will replace the old commit by a new commit incorporating your
2492
changes, giving you a chance to edit the old commit message first.
2493
2494
-You can also use a combination of this and gitlink:git-rebase[1] to
2494
+You can also use a combination of this and linkgit:git-rebase[1] to
2495
replace a commit further back in your history and recreate the
2496
intervening changes on top of it. First, tag the problematic commit
2497
with
@@ -2529,7 +2529,7 @@ new commits having new object names.
2529
Reordering or selecting from a patch series
2530
-------------------------------------------
2531
2532
-Given one existing commit, the gitlink:git-cherry-pick[1] command
2532
+Given one existing commit, the linkgit:git-cherry-pick[1] command
2533
allows you to apply the change introduced by that commit and create a
2534
new commit that records it. So, for example, if "mywork" points to a
2535
series of patches on top of "origin", you might do something like:
@@ -2542,7 +2542,7 @@ $ gitk origin..mywork &
2542
and browse through the list of patches in the mywork branch using gitk,
2543
applying them (possibly in a different order) to mywork-new using
2544
cherry-pick, and possibly modifying them as you go using `commit --amend`.
2545
-The gitlink:git-gui[1] command may also help as it allows you to
2545
+The linkgit:git-gui[1] command may also help as it allows you to
2546
individually select diff hunks for inclusion in the index (by
2547
right-clicking on the diff hunk and choosing "Stage Hunk for Commit").
2548
@@ -2555,7 +2555,7 @@ $ git reset --hard origin
2555
-------------------------------------------------
2556
2557
Then modify, reorder, or eliminate patches as preferred before applying
2558
-them again with gitlink:git-am[1].
2558
+them again with linkgit:git-am[1].
2559
2560
[[patch-series-tools]]
2561
Other tools
@@ -2618,7 +2618,7 @@ published branches should never be rewritten.
2618
Why bisecting merge commits can be harder than bisecting linear history
2619
-----------------------------------------------------------------------
2620
2621
-The gitlink:git-bisect[1] command correctly handles history that
2621
+The linkgit:git-bisect[1] command correctly handles history that
2622
includes merge commits. However, when the commit that it finds is a
2623
merge commit, the user may need to work harder than usual to figure out
2624
why that commit introduced a problem.
@@ -2651,7 +2651,7 @@ Nevertheless, the code at C is broken, because the callers added
2651
on the lower line of development have not been converted to the new
2652
semantics introduced on the upper line of development. So if all
2653
you know is that D is bad, that Z is good, and that
2654
-gitlink:git-bisect[1] identifies C as the culprit, how will you
2654
+linkgit:git-bisect[1] identifies C as the culprit, how will you
2655
figure out that the problem is due to this change in semantics?
2656
2657
When the result of a git-bisect is a non-merge commit, you should
@@ -2688,7 +2688,7 @@ Advanced branch management
2688
Fetching individual branches
2689
----------------------------
2690
2691
-Instead of using gitlink:git-remote[1], you can also choose just
2691
+Instead of using linkgit:git-remote[1], you can also choose just
2692
to update one branch at a time, and to store it locally under an
2693
arbitrary name:
2694
@@ -2779,7 +2779,7 @@ Configuring remote branches
2779
We saw above that "origin" is just a shortcut to refer to the
2780
repository that you originally cloned from. This information is
2781
stored in git configuration variables, which you can see using
2782
-gitlink:git-config[1]:
2782
+linkgit:git-config[1]:
2783
2784
-------------------------------------------------
2785
$ git config -l
@@ -2832,9 +2832,9 @@ throwing away commits on mybranch.
2832
2833
Also note that all of the above configuration can be performed by
2834
directly editing the file .git/config instead of using
2835
-gitlink:git-config[1].
2835
+linkgit:git-config[1].
2836
2837
-See gitlink:git-config[1] for more details on the configuration
2837
+See linkgit:git-config[1] for more details on the configuration
2838
options mentioned above.
2839
2840
@@ -2900,7 +2900,7 @@ Commit Object
2900
2901
The "commit" object links a physical state of a tree with a description
2902
of how we got there and why. Use the --pretty=raw option to
2903
-gitlink:git-show[1] or gitlink:git-log[1] to examine your favorite
2903
+linkgit:git-show[1] or linkgit:git-log[1] to examine your favorite
2904
commit:
2905
2906
------------------------------------------------
@@ -2941,9 +2941,9 @@ of the tree referred to by this commit with the trees associated with
2941
its parents. In particular, git does not attempt to record file renames
2942
explicitly, though it can identify cases where the existence of the same
2943
file data at changing paths suggests a rename. (See, for example, the
2944
--M option to gitlink:git-diff[1]).
2944
+-M option to linkgit:git-diff[1]).
2945
2946
-A commit is usually created by gitlink:git-commit[1], which creates a
2946
+A commit is usually created by linkgit:git-commit[1], which creates a
2947
commit whose parent is normally the current HEAD, and whose tree is
2948
taken from the content currently stored in the index.
2949
@@ -2951,8 +2951,8 @@ taken from the content currently stored in the index.
2951
Tree Object
2952
~~~~~~~~~~~
2953
2954
-The ever-versatile gitlink:git-show[1] command can also be used to
2955
-examine tree objects, but gitlink:git-ls-tree[1] will give you more
2954
+The ever-versatile linkgit:git-show[1] command can also be used to
2955
+examine tree objects, but linkgit:git-ls-tree[1] will give you more
2956
details:
2957
2958
------------------------------------------------
@@ -2991,7 +2991,7 @@ attention to the executable bit.
2991
Blob Object
2992
~~~~~~~~~~~
2993
2994
-You can use gitlink:git-show[1] to examine the contents of a blob; take,
2994
+You can use linkgit:git-show[1] to examine the contents of a blob; take,
2995
for example, the blob in the entry for "COPYING" from the tree above:
2996
2997
------------------------------------------------
@@ -3013,7 +3013,7 @@ is totally independent of its location in the directory tree, and
3013
renaming a file does not change the object that file is associated with.
3014
3015
Note that any tree or blob object can be examined using
3016
-gitlink:git-show[1] with the <revision>:<path> syntax. This can
3016
+linkgit:git-show[1] with the <revision>:<path> syntax. This can
3017
sometimes be useful for browsing the contents of a tree that is not
3018
currently checked out.
3019
@@ -3053,7 +3053,7 @@ Tag Object
3053
3054
A tag object contains an object, object type, tag name, the name of the
3055
person ("tagger") who created the tag, and a message, which may contain
3056
-a signature, as can be seen using the gitlink:git-cat-file[1]:
3056
+a signature, as can be seen using the linkgit:git-cat-file[1]:
3057
3058
------------------------------------------------
3059
$ git cat-file tag v1.5.0
@@ -3072,8 +3072,8 @@ nLE/L9aUXdWeTFPron96DLA=
3072
-----END PGP SIGNATURE-----
3073
------------------------------------------------
3074
3075
-See the gitlink:git-tag[1] command to learn how to create and verify tag
3076
-objects. (Note that gitlink:git-tag[1] can also be used to create
3075
+See the linkgit:git-tag[1] command to learn how to create and verify tag
3076
+objects. (Note that linkgit:git-tag[1] can also be used to create
3077
"lightweight tags", which are not tag objects at all, but just simple
3078
references whose names begin with "refs/tags/").
3079
@@ -3135,14 +3135,14 @@ $ git count-objects
3135
Although the object files are gone, any commands that refer to those
3136
objects will work exactly as they did before.
3137
3138
-The gitlink:git-gc[1] command performs packing, pruning, and more for
3138
+The linkgit:git-gc[1] command performs packing, pruning, and more for
3139
you, so is normally the only high-level command you need.
3140
3141
[[dangling-objects]]
3142
Dangling objects
3143
~~~~~~~~~~~~~~~~
3144
3145
-The gitlink:git-fsck[1] command will sometimes complain about dangling
3145
+The linkgit:git-fsck[1] command will sometimes complain about dangling
3146
objects. They are not a problem.
3147
3148
The most common cause of dangling objects is that you've rebased a
@@ -3246,7 +3246,7 @@ which is sometimes a solvable problem. (Recovering missing trees and
3246
especially commits is *much* harder).
3247
3248
Before starting, verify that there is corruption, and figure out where
3249
-it is with gitlink:git-fsck[1]; this may be time-consuming.
3249
+it is with linkgit:git-fsck[1]; this may be time-consuming.
3250
3251
Assume the output looks like this:
3252
@@ -3264,7 +3264,7 @@ Now you know that blob 4b9458b3 is missing, and that the tree 2d9263c6
3264
points to it. If you could find just one copy of that missing blob
3265
object, possibly in some other repository, you could move it into
3266
.git/objects/4b/9458b3... and be done. Suppose you can't. You can
3267
-still examine the tree that pointed to it with gitlink:git-ls-tree[1],
3267
+still examine the tree that pointed to it with linkgit:git-ls-tree[1],
3268
which might output something like:
3269
3270
------------------------------------------------
@@ -3282,7 +3282,7 @@ So now you know that the missing blob was the data for a file named
3282
say it's in "somedirectory". If you're lucky the missing copy might be
3283
the same as the copy you have checked out in your working tree at
3284
"somedirectory/myfile"; you can test whether that's right with
3285
-gitlink:git-hash-object[1]:
3285
+linkgit:git-hash-object[1]:
3286
3287
------------------------------------------------
3288
$ git hash-object -w somedirectory/myfile
@@ -3352,7 +3352,7 @@ The index
3352
3353
The index is a binary file (generally kept in .git/index) containing a
3354
sorted list of path names, each with permissions and the SHA1 of a blob
3355
-object; gitlink:git-ls-files[1] can show you the contents of the index:
3355
+object; linkgit:git-ls-files[1] can show you the contents of the index:
3356
3357
-------------------------------------------------
3358
$ git ls-files --stage
@@ -3374,7 +3374,7 @@ properties:
3374
1. The index contains all the information necessary to generate a single
3375
(uniquely determined) tree object.
3376
+
3377
-For example, running gitlink:git-commit[1] generates this tree object
3377
+For example, running linkgit:git-commit[1] generates this tree object
3378
from the index, stores it in the object database, and uses it as the
3379
tree object associated with the new commit.
3380
@@ -3395,7 +3395,7 @@ you can create a three-way merge between them.
3395
+
3396
We saw in <<conflict-resolution>> that during a merge the index can
3397
store multiple versions of a single file (called "stages"). The third
3398
-column in the gitlink:git-ls-files[1] output above is the stage
3398
+column in the linkgit:git-ls-files[1] output above is the stage
3399
number, and will take on values other than 0 for files with merge
3400
conflicts.
3401
@@ -3444,7 +3444,7 @@ commit ID, so other developers who clone the containing project
3444
Partial checkouts of the superproject are possible: you can tell Git to
3445
clone none, some or all of the submodules.
3446
3447
-The gitlink:git-submodule[1] command is available since Git 1.5.3. Users
3447
+The linkgit:git-submodule[1] command is available since Git 1.5.3. Users
3448
with Git 1.5.2 can look up the submodule commits in the repository and
3449
manually check them out; earlier versions won't recognize the submodules at
3450
all.
@@ -3492,7 +3492,7 @@ The `git submodule add` command does a couple of things:
3492
3493
- It clones the submodule under the current directory and by default checks out
3494
the master branch.
3495
-- It adds the submodule's clone path to the gitlink:gitmodules[5] file and
3495
+- It adds the submodule's clone path to the linkgit:gitmodules[5] file and
3496
adds this file to the index, ready to be committed.
3497
- It adds the submodule's current commit ID to the index, ready to be
3498
committed.
@@ -3653,26 +3653,26 @@ understand its inner workings.
3653
Object access and manipulation
3654
------------------------------
3655
3656
-The gitlink:git-cat-file[1] command can show the contents of any object,
3657
-though the higher-level gitlink:git-show[1] is usually more useful.
3656
+The linkgit:git-cat-file[1] command can show the contents of any object,
3657
+though the higher-level linkgit:git-show[1] is usually more useful.
3658
3659
-The gitlink:git-commit-tree[1] command allows constructing commits with
3659
+The linkgit:git-commit-tree[1] command allows constructing commits with
3660
arbitrary parents and trees.
3661
3662
-A tree can be created with gitlink:git-write-tree[1] and its data can be
3663
-accessed by gitlink:git-ls-tree[1]. Two trees can be compared with
3664
-gitlink:git-diff-tree[1].
3662
+A tree can be created with linkgit:git-write-tree[1] and its data can be
3663
+accessed by linkgit:git-ls-tree[1]. Two trees can be compared with
3664
+linkgit:git-diff-tree[1].
3665
3666
-A tag is created with gitlink:git-mktag[1], and the signature can be
3667
-verified by gitlink:git-verify-tag[1], though it is normally simpler to
3668
-use gitlink:git-tag[1] for both.
3666
+A tag is created with linkgit:git-mktag[1], and the signature can be
3667
+verified by linkgit:git-verify-tag[1], though it is normally simpler to
3668
+use linkgit:git-tag[1] for both.
3669
3670
[[the-workflow]]
3671
The Workflow
3672
------------
3673
3674
-High-level operations such as gitlink:git-commit[1],
3675
-gitlink:git-checkout[1] and gitlink:git-reset[1] work by moving data
3674
+High-level operations such as linkgit:git-commit[1],
3675
+linkgit:git-checkout[1] and linkgit:git-reset[1] work by moving data
3676
between the working tree, the index, and the object database. Git
3677
provides low-level operations which perform each of these steps
3678
individually.
@@ -3687,7 +3687,7 @@ combinations:
3687
working directory -> index
3688
~~~~~~~~~~~~~~~~~~~~~~~~~~
3689
3690
-The gitlink:git-update-index[1] command updates the index with
3690
+The linkgit:git-update-index[1] command updates the index with
3691
information from the working directory. You generally update the
3692
index information by just specifying the filename you want to update,
3693
like so:
@@ -3717,8 +3717,8 @@ stat information. It will 'not' update the object status itself, and
3717
it will only update the fields that are used to quickly test whether
3718
an object still matches its old backing store object.
3719
3720
-The previously introduced gitlink:git-add[1] is just a wrapper for
3721
-gitlink:git-update-index[1].
3720
+The previously introduced linkgit:git-add[1] is just a wrapper for
3721
+linkgit:git-update-index[1].
3722
3723
[[index-to-object-database]]
3724
index -> object database
@@ -3865,7 +3865,7 @@ Examining the data
3865
3866
You can examine the data represented in the object database and the
3867
index with various helper tools. For every object, you can use
3868
-gitlink:git-cat-file[1] to examine details about the
3868
+linkgit:git-cat-file[1] to examine details about the
3869
object:
3870
3871
-------------------------------------------------
@@ -4528,7 +4528,7 @@ Scan Documentation/ for other stuff left out; in particular:
4528
- howto's
4529
- some of technical/?
4530
- hooks
4531
-- list of commands in gitlink:git[1]
4531
+- list of commands in linkgit:git[1]
4532
4533
Scan email archives for other stuff left out
4534