tests/test-histedit-outgoing.t
changeset 20511 5840da876235
parent 20503 23dc77874191
child 22152 d2a5986cb89d
equal deleted inserted replaced
20510:edfbcc3163a8 20511:5840da876235
    46   # Commits are listed from least to most recent
    46   # Commits are listed from least to most recent
    47   #
    47   #
    48   # Commands:
    48   # Commands:
    49   #  p, pick = use commit
    49   #  p, pick = use commit
    50   #  e, edit = use commit, but stop for amending
    50   #  e, edit = use commit, but stop for amending
    51   #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
    51   #  f, fold = use commit, but combine it with the one above
    52   #  d, drop = remove commit from history
    52   #  d, drop = remove commit from history
    53   #  m, mess = edit message without changing commit content
    53   #  m, mess = edit message without changing commit content
    54   #
    54   #
    55   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    55   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    56   $ cd ..
    56   $ cd ..
    77   # Commits are listed from least to most recent
    77   # Commits are listed from least to most recent
    78   #
    78   #
    79   # Commands:
    79   # Commands:
    80   #  p, pick = use commit
    80   #  p, pick = use commit
    81   #  e, edit = use commit, but stop for amending
    81   #  e, edit = use commit, but stop for amending
    82   #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
    82   #  f, fold = use commit, but combine it with the one above
    83   #  d, drop = remove commit from history
    83   #  d, drop = remove commit from history
    84   #  m, mess = edit message without changing commit content
    84   #  m, mess = edit message without changing commit content
    85   #
    85   #
    86   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    86   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    87   $ cd ..
    87   $ cd ..
   100   # Commits are listed from least to most recent
   100   # Commits are listed from least to most recent
   101   #
   101   #
   102   # Commands:
   102   # Commands:
   103   #  p, pick = use commit
   103   #  p, pick = use commit
   104   #  e, edit = use commit, but stop for amending
   104   #  e, edit = use commit, but stop for amending
   105   #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
   105   #  f, fold = use commit, but combine it with the one above
   106   #  d, drop = remove commit from history
   106   #  d, drop = remove commit from history
   107   #  m, mess = edit message without changing commit content
   107   #  m, mess = edit message without changing commit content
   108   #
   108   #
   109   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   109   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   110 
   110