tests/test-rebase-parameters.out
changeset 9599 f3404b7f37ca
parent 9073 ec1cd3176625
parent 9589 fdf0c375cdbf
child 10352 66d954e76ffb
equal deleted inserted replaced
9598:a981ddb16b80 9599:f3404b7f37ca
    16 options:
    16 options:
    17 
    17 
    18  -s --source        rebase from a given revision
    18  -s --source        rebase from a given revision
    19  -b --base          rebase from the base of a given revision
    19  -b --base          rebase from the base of a given revision
    20  -d --dest          rebase onto a given revision
    20  -d --dest          rebase onto a given revision
    21     --collapse      collapse the rebased revisions
    21     --collapse      collapse the rebased changesets
    22     --keep          keep original revisions
    22     --keep          keep original changesets
    23     --keepbranches  keep original branches
    23     --keepbranches  keep original branch names
    24  -c --continue      continue an interrupted rebase
    24  -c --continue      continue an interrupted rebase
    25  -a --abort         abort an interrupted rebase
    25  -a --abort         abort an interrupted rebase
    26     --style         display using template map file
    26     --style         display using template map file
    27     --template      display with template
    27     --template      display with template
    28 
    28 
    44 options:
    44 options:
    45 
    45 
    46  -s --source        rebase from a given revision
    46  -s --source        rebase from a given revision
    47  -b --base          rebase from the base of a given revision
    47  -b --base          rebase from the base of a given revision
    48  -d --dest          rebase onto a given revision
    48  -d --dest          rebase onto a given revision
    49     --collapse      collapse the rebased revisions
    49     --collapse      collapse the rebased changesets
    50     --keep          keep original revisions
    50     --keep          keep original changesets
    51     --keepbranches  keep original branches
    51     --keepbranches  keep original branch names
    52  -c --continue      continue an interrupted rebase
    52  -c --continue      continue an interrupted rebase
    53  -a --abort         abort an interrupted rebase
    53  -a --abort         abort an interrupted rebase
    54     --style         display using template map file
    54     --style         display using template map file
    55     --template      display with template
    55     --template      display with template
    56 
    56 
    72 options:
    72 options:
    73 
    73 
    74  -s --source        rebase from a given revision
    74  -s --source        rebase from a given revision
    75  -b --base          rebase from the base of a given revision
    75  -b --base          rebase from the base of a given revision
    76  -d --dest          rebase onto a given revision
    76  -d --dest          rebase onto a given revision
    77     --collapse      collapse the rebased revisions
    77     --collapse      collapse the rebased changesets
    78     --keep          keep original revisions
    78     --keep          keep original changesets
    79     --keepbranches  keep original branches
    79     --keepbranches  keep original branch names
    80  -c --continue      continue an interrupted rebase
    80  -c --continue      continue an interrupted rebase
    81  -a --abort         abort an interrupted rebase
    81  -a --abort         abort an interrupted rebase
    82     --style         display using template map file
    82     --style         display using template map file
    83     --template      display with template
    83     --template      display with template
    84 
    84 
   100 options:
   100 options:
   101 
   101 
   102  -s --source        rebase from a given revision
   102  -s --source        rebase from a given revision
   103  -b --base          rebase from the base of a given revision
   103  -b --base          rebase from the base of a given revision
   104  -d --dest          rebase onto a given revision
   104  -d --dest          rebase onto a given revision
   105     --collapse      collapse the rebased revisions
   105     --collapse      collapse the rebased changesets
   106     --keep          keep original revisions
   106     --keep          keep original changesets
   107     --keepbranches  keep original branches
   107     --keepbranches  keep original branch names
   108  -c --continue      continue an interrupted rebase
   108  -c --continue      continue an interrupted rebase
   109  -a --abort         abort an interrupted rebase
   109  -a --abort         abort an interrupted rebase
   110     --style         display using template map file
   110     --style         display using template map file
   111     --template      display with template
   111     --template      display with template
   112 
   112