tests/test-histedit-outgoing.t
changeset 34489 270e344a6c74
parent 31056 37ab9e20991c
child 46104 6f8a94bbfba1
equal deleted inserted replaced
34488:6bda8a9d8431 34489:270e344a6c74
    50   # Commands:
    50   # Commands:
    51   #
    51   #
    52   #  e, edit = use commit, but stop for amending
    52   #  e, edit = use commit, but stop for amending
    53   #  m, mess = edit commit message without changing commit content
    53   #  m, mess = edit commit message without changing commit content
    54   #  p, pick = use commit
    54   #  p, pick = use commit
       
    55   #  b, base = checkout changeset and apply further changesets from there
    55   #  d, drop = remove commit from history
    56   #  d, drop = remove commit from history
    56   #  f, fold = use commit, but combine it with the one above
    57   #  f, fold = use commit, but combine it with the one above
    57   #  r, roll = like fold, but discard this commit's description and date
    58   #  r, roll = like fold, but discard this commit's description and date
    58   #
    59   #
    59   $ cd ..
    60   $ cd ..
    84   # Commands:
    85   # Commands:
    85   #
    86   #
    86   #  e, edit = use commit, but stop for amending
    87   #  e, edit = use commit, but stop for amending
    87   #  m, mess = edit commit message without changing commit content
    88   #  m, mess = edit commit message without changing commit content
    88   #  p, pick = use commit
    89   #  p, pick = use commit
       
    90   #  b, base = checkout changeset and apply further changesets from there
    89   #  d, drop = remove commit from history
    91   #  d, drop = remove commit from history
    90   #  f, fold = use commit, but combine it with the one above
    92   #  f, fold = use commit, but combine it with the one above
    91   #  r, roll = like fold, but discard this commit's description and date
    93   #  r, roll = like fold, but discard this commit's description and date
    92   #
    94   #
    93   $ cd ..
    95   $ cd ..
   110   # Commands:
   112   # Commands:
   111   #
   113   #
   112   #  e, edit = use commit, but stop for amending
   114   #  e, edit = use commit, but stop for amending
   113   #  m, mess = edit commit message without changing commit content
   115   #  m, mess = edit commit message without changing commit content
   114   #  p, pick = use commit
   116   #  p, pick = use commit
       
   117   #  b, base = checkout changeset and apply further changesets from there
   115   #  d, drop = remove commit from history
   118   #  d, drop = remove commit from history
   116   #  f, fold = use commit, but combine it with the one above
   119   #  f, fold = use commit, but combine it with the one above
   117   #  r, roll = like fold, but discard this commit's description and date
   120   #  r, roll = like fold, but discard this commit's description and date
   118   #
   121   #
   119 
   122