Mercurial > hg
comparison hgext/rebase.py @ 9271:4ea022359c43
rebase: wrap docstrings at 70 characters
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 26 Jul 2009 01:59:59 +0200 |
parents | 07d127e771a1 |
children | ad4501d20214 |
comparison
equal
deleted
inserted
replaced
9270:00cc7fa0c0c6 | 9271:4ea022359c43 |
---|---|
5 # This software may be used and distributed according to the terms of the | 5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2, incorporated herein by reference. | 6 # GNU General Public License version 2, incorporated herein by reference. |
7 | 7 |
8 '''command to move sets of revisions to a different ancestor | 8 '''command to move sets of revisions to a different ancestor |
9 | 9 |
10 This extension lets you rebase changesets in an existing Mercurial repository. | 10 This extension lets you rebase changesets in an existing Mercurial |
11 repository. | |
11 | 12 |
12 For more information: | 13 For more information: |
13 http://mercurial.selenic.com/wiki/RebaseProject | 14 http://mercurial.selenic.com/wiki/RebaseProject |
14 ''' | 15 ''' |
15 | 16 |
39 return stats | 40 return stats |
40 | 41 |
41 def rebase(ui, repo, **opts): | 42 def rebase(ui, repo, **opts): |
42 """move changeset (and descendants) to a different branch | 43 """move changeset (and descendants) to a different branch |
43 | 44 |
44 Rebase uses repeated merging to graft changesets from one part of history | 45 Rebase uses repeated merging to graft changesets from one part of |
45 onto another. This can be useful for linearizing local changes relative to | 46 history onto another. This can be useful for linearizing local |
46 a master development tree. | 47 changes relative to a master development tree. |
47 | 48 |
48 If a rebase is interrupted to manually resolve a merge, it can be | 49 If a rebase is interrupted to manually resolve a merge, it can be |
49 continued with --continue/-c or aborted with --abort/-a. | 50 continued with --continue/-c or aborted with --abort/-a. |
50 """ | 51 """ |
51 originalwd = target = None | 52 originalwd = target = None |