Changes between Version 26 and Version 27 of CollaborateOnGithub


Ignore:
Timestamp:
10/08/2009 05:23:03 PM (6 years ago)
Author:
mrts
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v26 v27  
    172172To abort the rebase, just remove all non-commented lines.
    173173
    174 You may need to use `--force` to push changes back to !GitHub
     174If something went wrong during rebase and you want to undo the rebase:
     175
     176 1. Find out the state identifier before the rebase:
     177 {{{
     178git reflog
     179 }}}
     180 1. Switch back to that state
     181 {{{
     182git reset --hard HEAD@{NUMBER_FROM_REFLOG_HERE}
     183 }}}
     184
     185This works for all other similar problems as well, e.g. for backing out a merge.
     186
     187You will probably need to use `--force` to push changes back to !GitHub
    175188{{{
    176189git push --force
    177190}}}
    178 
    179 If something went wrong during rebase and you want to undo the rebase:
    180 
    181  1. Find out the state identifier before the rebase:
    182  {{{
    183 git reflog
    184  }}}
    185  1. Switch back to that state
    186  {{{
    187 git reset --hard HEAD@{NUMBER_FROM_REFLOG_HERE}
    188  }}}
    189 
    190 This works for all other similar problems as well, e.g. for backing out a merge.
    191191
    192192== Collaboration on a large feature ==
Back to Top