Show More
@@ -215,4 +215,34 b' PYTHONPATH::' | |||||
215 | A range acts as a closed interval. This means that a range of 3:5 |
|
215 | A range acts as a closed interval. This means that a range of 3:5 | |
216 | gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2. |
|
216 | gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2. | |
217 | ''')), |
|
217 | ''')), | |
|
218 | ||||
|
219 | (['gitdiffs'], _('Using git Diffs'), | |||
|
220 | _(r''' | |||
|
221 | In several places, Mercurial supports two separate variations on | |||
|
222 | the unified diff format: normal diffs, as are de facto standardized | |||
|
223 | by GNU's patch utility, and git diffs, invented for the git VCS. | |||
|
224 | ||||
|
225 | The git diff format is an addition of some information to the normal | |||
|
226 | diff format, which allows diff to convey changes in file permissions | |||
|
227 | as well as the creation, deletion, renaming and copying of files, as | |||
|
228 | well as diffs for binary files (unsupported by standard diff), | |||
|
229 | operations which are very useful to modern version control systems | |||
|
230 | such as Mercurial, in trying to faithfully replay your changes. | |||
|
231 | ||||
|
232 | In building Mercurial, we made a choice to support the git diff | |||
|
233 | format, but we haven't made it the default. This is because for a | |||
|
234 | long time, the format for unified diffs we usually use has been | |||
|
235 | defined by GNU patch, and it doesn't (yet) support git's extensions | |||
|
236 | to the diff format. This means that, when extracting diffs from a | |||
|
237 | Mercurial repository (through the diff command, for example), you | |||
|
238 | must be careful about things like file copies and renames (file | |||
|
239 | creation and deletion are mostly handled fine by the traditional | |||
|
240 | diff format, with some rare edge cases for which the git extensions | |||
|
241 | can be used). Mercurial's internal operations (like push and pull) | |||
|
242 | are not affected by these differences, because they use a different, | |||
|
243 | binary format for communicating changes. | |||
|
244 | ||||
|
245 | To use git diffs, use the --git option for relevant commands, or | |||
|
246 | enable them in a hgrc, setting 'git = True' in the [diff] section. | |||
|
247 | ''')), | |||
218 | ) |
|
248 | ) |
@@ -205,6 +205,7 b' additional help topics:' | |||||
205 | environment Environment Variables |
|
205 | environment Environment Variables | |
206 | revisions Specifying Single Revisions |
|
206 | revisions Specifying Single Revisions | |
207 | multirevs Specifying Multiple Revisions |
|
207 | multirevs Specifying Multiple Revisions | |
|
208 | gitdiffs Using git Diffs | |||
208 |
|
209 | |||
209 | use "hg -v help" to show aliases and global options |
|
210 | use "hg -v help" to show aliases and global options | |
210 | Mercurial Distributed SCM |
|
211 | Mercurial Distributed SCM | |
@@ -267,6 +268,7 b' additional help topics:' | |||||
267 | environment Environment Variables |
|
268 | environment Environment Variables | |
268 | revisions Specifying Single Revisions |
|
269 | revisions Specifying Single Revisions | |
269 | multirevs Specifying Multiple Revisions |
|
270 | multirevs Specifying Multiple Revisions | |
|
271 | gitdiffs Using git Diffs | |||
270 |
|
272 | |||
271 | use "hg -v help" to show aliases and global options |
|
273 | use "hg -v help" to show aliases and global options | |
272 | %% not tested: --debugger |
|
274 | %% not tested: --debugger |
@@ -96,6 +96,7 b' additional help topics:' | |||||
96 | environment Environment Variables |
|
96 | environment Environment Variables | |
97 | revisions Specifying Single Revisions |
|
97 | revisions Specifying Single Revisions | |
98 | multirevs Specifying Multiple Revisions |
|
98 | multirevs Specifying Multiple Revisions | |
|
99 | gitdiffs Using git Diffs | |||
99 |
|
100 | |||
100 | use "hg -v help" to show aliases and global options |
|
101 | use "hg -v help" to show aliases and global options | |
101 | add add the specified files on the next commit |
|
102 | add add the specified files on the next commit | |
@@ -154,6 +155,7 b' additional help topics:' | |||||
154 | environment Environment Variables |
|
155 | environment Environment Variables | |
155 | revisions Specifying Single Revisions |
|
156 | revisions Specifying Single Revisions | |
156 | multirevs Specifying Multiple Revisions |
|
157 | multirevs Specifying Multiple Revisions | |
|
158 | gitdiffs Using git Diffs | |||
157 | hg add [OPTION]... [FILE]... |
|
159 | hg add [OPTION]... [FILE]... | |
158 |
|
160 | |||
159 | add the specified files on the next commit |
|
161 | add the specified files on the next commit |
General Comments 0
You need to be logged in to leave comments.
Login now