Mercurial > hg > mercurial-crew-with-dirclash

comparison doc/hg.1.txt @ 196:48827121af7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add export, recover, and undo to the man page add export to hg help
author jake@edge2.net
date Mon, 30 May 2005 09:53:48 -0700
parents 089594a5bbde
children 73b8a8a059ec 27d08c0c2a7e
comparison
equal deleted inserted replaced
195:b98bcf66dd9d 196:48827121af7e
98 98
99 dumpmanifest [revision]:: 99 dumpmanifest [revision]::
100 print the indicated revision of the manifest (list of version controlled 100 print the indicated revision of the manifest (list of version controlled
101 files) 101 files)
102 102
103 export [revision]::
104 print the changeset header (author, changeset hash, parent, and commit
105 comment) and the diffs for a particular revision.
106
103 history:: 107 history::
104 print the revision history of the repository 108 print the revision history of the repository
105 109
106 init:: 110 init::
107 initialize a repository in the current directory 111 initialize a repository in the current directory
115 as a program to resolve any merge conflicts between the two repositories. 119 as a program to resolve any merge conflicts between the two repositories.
116 An implicit commit is done at the end of this process if there were any 120 An implicit commit is done at the end of this process if there were any
117 merge conflicts. Note that merge does not yet merge with changed files 121 merge conflicts. Note that merge does not yet merge with changed files
118 in the working dir. 122 in the working dir.
119 123
124 recover::
125 rollback an interrupted transaction
126
120 remove [files ...]:: 127 remove [files ...]::
121 schedule the indicated files for removal from the repository at the next 128 schedule the indicated files for removal from the repository at the next
122 commit 129 commit
123 130
124 serve [-a addr -n name -p port -t templatedir]:: 131 serve [-a addr -n name -p port -t templatedir]::
132 list new, changed, and missing files in the working directory 139 list new, changed, and missing files in the working directory
133 140
134 tags:: 141 tags::
135 list the current tags 142 list the current tags
136 143
144 undo::
145 undo the last transaction
146
137 ENVIRONMENT VARIABLES 147 ENVIRONMENT VARIABLES
138 --------------------- 148 ---------------------
139 HGMERGE:: 149 HGMERGE::
140 points to an executable to use for resolving merge conflicts, the 150 points to an executable to use for resolving merge conflicts, the
141 program will be executed with four arguments: local file, remote 151 program will be executed with four arguments: local file, remote