diff options
| author | Eli Zaretskii | 2019-11-30 14:06:19 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-11-30 14:06:19 +0200 |
| commit | e6e0654daabd13600988d7298de32048bf117801 (patch) | |
| tree | 339f4d83c2c48cf07bf0bb7f16b08160232b7043 /doc | |
| parent | 561840b553274207f814b33a211ce7e12c92c9a6 (diff) | |
| download | emacs-e6e0654daabd13600988d7298de32048bf117801.tar.gz emacs-e6e0654daabd13600988d7298de32048bf117801.zip | |
Minor fixes in last change
* doc/emacs/maintaining.texi (Switching Branches)
(Pulling / Pushing, Merging): Fix markup of shell commands.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/maintaining.texi | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 7570fef33e7..fa92f568dac 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -1439,12 +1439,12 @@ Mercurial in its normal mode of operation, each branch has its own | |||
| 1439 | working directory tree, so switching between branches just involves | 1439 | working directory tree, so switching between branches just involves |
| 1440 | switching directories. On Git, branches are normally @dfn{co-located} | 1440 | switching directories. On Git, branches are normally @dfn{co-located} |
| 1441 | in the same directory, and switching between branches is done using | 1441 | in the same directory, and switching between branches is done using |
| 1442 | the @command{git checkout} command, which changes the contents of the | 1442 | the @kbd{git checkout} command, which changes the contents of the |
| 1443 | working tree to match the branch you switch to. Bazaar also supports | 1443 | working tree to match the branch you switch to. Bazaar also supports |
| 1444 | co-located branches, in which case the @command{bzr switch} command | 1444 | co-located branches, in which case the @kbd{bzr switch} command |
| 1445 | will switch branches in the current directory. With Subversion, you | 1445 | will switch branches in the current directory. With Subversion, you |
| 1446 | switch to another branch using the @command{svn switch} command. With | 1446 | switch to another branch using the @kbd{svn switch} command. With |
| 1447 | Mercurial, command @command{hg update} is used to swith to another | 1447 | Mercurial, command @kbd{hg update} is used to swith to another |
| 1448 | branch. | 1448 | branch. |
| 1449 | 1449 | ||
| 1450 | The VC command to switch to another branch in the current directory | 1450 | The VC command to switch to another branch in the current directory |
| @@ -1492,8 +1492,8 @@ On a decentralized version control system, the command @kbd{C-x v P} | |||
| 1492 | (@code{vc-push}) updates another location with changes from the | 1492 | (@code{vc-push}) updates another location with changes from the |
| 1493 | current branch. With a prefix argument, it prompts for the exact | 1493 | current branch. With a prefix argument, it prompts for the exact |
| 1494 | version control command to run, which lets you specify where to push | 1494 | version control command to run, which lets you specify where to push |
| 1495 | changes; the default is @command{bzr push} with Bazaar, @command{git | 1495 | changes; the default is @kbd{bzr push} with Bazaar, @kbd{git |
| 1496 | push} with Git, and @command{hg push} with Mercurial. The default | 1496 | push} with Git, and @kbd{hg push} with Mercurial. The default |
| 1497 | commands always push to a default location determined by the version | 1497 | commands always push to a default location determined by the version |
| 1498 | control system from your branch configuration. | 1498 | control system from your branch configuration. |
| 1499 | 1499 | ||
| @@ -1522,11 +1522,11 @@ control system. | |||
| 1522 | 1522 | ||
| 1523 | Amongst decentralized version control systems, @kbd{C-x v +} is | 1523 | Amongst decentralized version control systems, @kbd{C-x v +} is |
| 1524 | currently supported only by Bazaar, Git, and Mercurial. With Bazaar, | 1524 | currently supported only by Bazaar, Git, and Mercurial. With Bazaar, |
| 1525 | it calls @command{bzr pull} for ordinary branches (to pull from a | 1525 | it calls @kbd{bzr pull} for ordinary branches (to pull from a |
| 1526 | master branch into a mirroring branch), and @command{bzr update} for a | 1526 | master branch into a mirroring branch), and @kbd{bzr update} for a |
| 1527 | bound branch (to pull from a central repository). With Git, it calls | 1527 | bound branch (to pull from a central repository). With Git, it calls |
| 1528 | @command{git pull} to fetch changes from a remote repository and merge | 1528 | @kbd{git pull} to fetch changes from a remote repository and merge |
| 1529 | it into the current branch. With Mercurial, it calls @command{hg pull | 1529 | it into the current branch. With Mercurial, it calls @kbd{hg pull |
| 1530 | -u} to fetch changesets from the default remote repository and update | 1530 | -u} to fetch changesets from the default remote repository and update |
| 1531 | the working directory. | 1531 | the working directory. |
| 1532 | 1532 | ||
| @@ -1557,11 +1557,11 @@ two branches. | |||
| 1557 | 1557 | ||
| 1558 | On a decentralized version control system, merging is done with the | 1558 | On a decentralized version control system, merging is done with the |
| 1559 | command @kbd{C-x v m} (@code{vc-merge}). On Bazaar, this prompts for | 1559 | command @kbd{C-x v m} (@code{vc-merge}). On Bazaar, this prompts for |
| 1560 | the exact arguments to pass to @command{bzr merge}, offering a | 1560 | the exact arguments to pass to @kbd{bzr merge}, offering a |
| 1561 | sensible default if possible. On Git, this prompts for the name of a | 1561 | sensible default if possible. On Git, this prompts for the name of a |
| 1562 | branch to merge from, with completion (based on the branch names known | 1562 | branch to merge from, with completion (based on the branch names known |
| 1563 | to the current repository). With Mercurial, this prompts for argument | 1563 | to the current repository). With Mercurial, this prompts for argument |
| 1564 | to pass to @command{hg merge}. The output from running the merge | 1564 | to pass to @kbd{hg merge}. The output from running the merge |
| 1565 | command is shown in a separate buffer. | 1565 | command is shown in a separate buffer. |
| 1566 | 1566 | ||
| 1567 | On a centralized version control system like CVS, @kbd{C-x v m} | 1567 | On a centralized version control system like CVS, @kbd{C-x v m} |