Edgewall Software

Changes between Initial Version and Version 1 of Ticket #12171, comment 17


Ignore:
Timestamp:
Mar 16, 2016, 11:07:22 AM (8 years ago)
Author:
Ryan J Ollos

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #12171, comment 17

    initial v1  
    1919# Note that your changes are based on the tip of 1.0-stable (a516b71)
    2020$ git checkout trunk
    21 # The next steps assumes you've added the mirror as described in https://trac.edgewall.org/wiki/TracTeam/Repositories#git
    22 # If you haven't added the mirror yet, run these next two steps:
     21# You should have added the mirror as described in https://trac.edgewall.org/wiki/TracTeam/Repositories#git
     22# If you haven't added the mirror yet, run these next two steps. If you have, skip them.
    2323$ git remote add mirror http://svn.edgewall.org/git/trac/mirror
    2424$ git fetch mirror
    … …  
    4646cf506ee 1.2dev: Unselect all other search filters when modifier key selected
    4747# Note that your four changesets are based on the tip of the trunk (cf506ee)
     48# Now we are finally ready to rebase
     49$ git rebase -i
    4850}}}
    4951
    5052Actually, I wouldn't be surprised if there's a better way to do that. With Git there's always several ways to accomplish the same task.
     53
     54Future rebases will be much simpler.
     55
     56{{{#!sh
     57$ git checkout trunk
     58$ git pull mirror trunk
     59$ git checkout -b t12171.2 t12171
     60$ git rebase trunk
     61$ git rebase -i   # Squash, fixup, edit commit message, etc ...
     62}}}