Mercurial > hg
annotate doc/hg.1.txt @ 8733:f8be48c6b08c
merge: simplify flag merging code slightly
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | 9d67706ee8d5 |
children | b2059435f176 |
rev | line source |
---|---|
177 | 1 HG(1) |
2 ===== | |
3 Matt Mackall <mpm@selenic.com> | |
4 | |
5 NAME | |
6 ---- | |
438 | 7 hg - Mercurial source code management system |
177 | 8 |
9 SYNOPSIS | |
10 -------- | |
3544
4745cf66f77d
Corrected hg synopsis.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3287
diff
changeset
|
11 'hg' [global option]... <command> [command/global option]... [argument]... |
177 | 12 |
13 DESCRIPTION | |
14 ----------- | |
8728
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
15 The hg(1) command provides a command line interface to the Mercurial |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
16 system. |
177 | 17 |
18 COMMAND ELEMENTS | |
19 ---------------- | |
20 | |
21 files ...:: | |
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
22 indicates one or more filename or relative path filenames; see |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
23 "FILE NAME PATTERNS" for information on pattern matching |
177 | 24 |
25 path:: | |
26 indicates a path on the local machine | |
27 | |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
28 revision:: |
8728
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
29 indicates a changeset which can be specified as a changeset |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
30 revision number, a tag, or a unique substring of the changeset |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
31 hash value |
177 | 32 |
33 repository path:: | |
498 | 34 either the pathname of a local repository or the URI of a remote |
7211 | 35 repository. |
438 | 36 |
1814
7956893e8458
generate hg manpage from commands.py docstring
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1758
diff
changeset
|
37 include::hg.1.gendoc.txt[] |
438 | 38 |
177 | 39 FILES |
40 ----- | |
6487
9e3bddb5fae2
hg.1: bogus escaping of .hg* not needed anymore
Christian Ebert <blacktrash@gmx.net>
parents:
5661
diff
changeset
|
41 .hgignore:: |
8728
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
42 This file contains regular expressions (one per line) that |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
43 describe file names that should be ignored by hg. For details, see |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
44 hgignore(5). |
177 | 45 |
6487
9e3bddb5fae2
hg.1: bogus escaping of .hg* not needed anymore
Christian Ebert <blacktrash@gmx.net>
parents:
5661
diff
changeset
|
46 .hgtags:: |
8728
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
47 This file contains changeset hash values and text tag names (one |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
48 of each separated by spaces) that correspond to tagged versions of |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
49 the repository contents. |
177 | 50 |
951
859de3ebc041
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
940
diff
changeset
|
51 /etc/mercurial/hgrc, $HOME/.hgrc, .hg/hgrc:: |
438 | 52 This file contains defaults and configuration. Values in .hg/hgrc |
8728
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
53 override those in $HOME/.hgrc, and these override settings made in |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
54 the global /etc/mercurial/hgrc configuration. See hgrc(5) for |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
55 details of the contents and format of these files. |
321 | 56 |
3021
b9dbbcf8a488
Document the fact that revert might overwrite .orig files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2859
diff
changeset
|
57 Some commands (e.g. revert) produce backup files ending in .orig, if |
8728
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
58 the .orig file already exists and is not tracked by Mercurial, it will |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
59 be overwritten. |
3021
b9dbbcf8a488
Document the fact that revert might overwrite .orig files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2859
diff
changeset
|
60 |
177 | 61 BUGS |
62 ---- | |
8728
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
63 Probably lots, please post them to the mailing list (See Resources |
9d67706ee8d5
hg.1: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net>
parents:
7211
diff
changeset
|
64 below) when you find them. |
177 | 65 |
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
66 SEE ALSO |
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
67 -------- |
2209
956e329f9e13
document hgignore syntax in new file doc/hgignore.5.txt.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2031
diff
changeset
|
68 hgignore(5), hgrc(5) |
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
69 |
177 | 70 AUTHOR |
71 ------ | |
72 Written by Matt Mackall <mpm@selenic.com> | |
73 | |
74 RESOURCES | |
75 --------- | |
76 http://selenic.com/mercurial[Main Web Site] | |
77 | |
78 http://selenic.com/hg[Source code repository] | |
79 | |
80 http://selenic.com/mailman/listinfo/mercurial[Mailing list] | |
81 | |
82 COPYING | |
83 ------- | |
4635
63b9d2deed48
Updated copyright notices and add "and others" to "hg version"
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3799
diff
changeset
|
84 Copyright \(C) 2005-2007 Matt Mackall. |
177 | 85 Free use of this software is granted under the terms of the GNU General |
86 Public License (GPL). |