← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

« back to all changes in this revision

Viewing changes to Documentation/howto/revert-branch-rebase.txt

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-04-22 13:31:05 UTC
  • mto: This revision was merged to the branch mainline in revision 20.
  • Revision ID: package-import@ubuntu.com-20070422133105-xg8fnm18r2cxcbg1
Tags: upstream-1.5.1.2
Import upstream version 1.5.1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
Documentation/howto/revert-branch-rebase.txt
85
85
 
86
86
------------------------------------------------
87
87
$ git checkout master
88
 
$ git resolve master revert-c99 fast ;# this should be a fast forward
 
88
$ git merge revert-c99 ;# this should be a fast forward
89
89
Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
90
90
 cache.h        |    8 ++++----
91
91
 commit.c       |    2 +-
95
95
 5 files changed, 8 insertions(+), 8 deletions(-)
96
96
------------------------------------------------
97
97
 
98
 
The 'fast' in the above 'git resolve' is not a magic.  I knew this
99
 
'resolve' would result in a fast forward merge, and if not, there is
100
 
something very wrong (so I would do 'git reset' on the 'master' branch
101
 
and examine the situation).  When a fast forward merge is done, the
102
 
message parameter to 'git resolve' is discarded, because no new commit
103
 
is created.  You could have said 'junk' or 'nothing' there as well.
104
 
 
105
98
There is no need to redo the test at this point.  We fast forwarded
106
99
and we know 'master' matches 'revert-c99' exactly.  In fact:
107
100