tests/test-tutorial.t
changeset 1782 a046e78c3290
parent 1756 a7dcfff8c4a9
child 1800 1554b30b18eb
child 1806 9f42f819267b
equal deleted inserted replaced
1781:39ef492603c6 1782:a046e78c3290
   478   
   478   
   479   aliases: squash
   479   aliases: squash
   480   
   480   
   481   fold multiple revisions into a single one
   481   fold multiple revisions into a single one
   482   
   482   
   483       By default, folds all the revisions linearly between the given revisions
   483       With --from, folds all the revisions linearly between the given revisions
   484       and the parent of the working directory.
   484       and the parent of the working directory.
   485   
   485   
   486       Use --exact for folding only the specified revisions while ignoring the
   486       With --exact, folds only the specified revisions while ignoring the parent
   487       parent of the working directory. In this case, the given revisions must
   487       of the working directory. In this case, the given revisions must form a
   488       form a linear unbroken chain.
   488       linear unbroken chain.
   489   
   489   
   490   options ([+] can be repeated):
   490   options ([+] can be repeated):
   491   
   491   
   492    -r --rev VALUE [+] revision to fold
   492    -r --rev VALUE [+] revision to fold
   493       --exact         only fold specified revisions
   493       --exact         only fold specified revisions
       
   494       --from          fold revisions linearly to working copy parent
   494    -m --message TEXT  use text as commit message
   495    -m --message TEXT  use text as commit message
   495    -l --logfile FILE  read commit message from file
   496    -l --logfile FILE  read commit message from file
   496    -d --date DATE     record the specified date as commit date
   497    -d --date DATE     record the specified date as commit date
   497    -u --user USER     record the specified user as committer
   498    -u --user USER     record the specified user as committer
   498   
   499