1,286
edits
Changes
Jump to navigation
Jump to search
Line 243:
Line 243: + + + + + + + + + + + + + + + + +
Activity Team/Git Activity Maintainer Walkthrough (view source)
Revision as of 23:04, 9 June 2010
, 23:04, 9 June 2010no edit summary
:'''<bernie>''' godiard: sure
:'''<bernie>''' godiard: sure
:'''<bernie>''' godiard: see you later
:'''<bernie>''' godiard: see you later
:<bernie> godiard: ok, so... where were we?
:<godiard> bernie: we need to correct old commits
:<bernie> godiard: oh yes. first, we'd better undo the mistake of rebasing with no change
:<bernie> godiard: I mean, the mistake of rebasing without editing the interim commits
:<godiard> bernie: ok git reset ?
:<bernie> godiard: in order to do this, meet the multiple-undo log of git: git reflog
:<bernie> godiard: this will show you the last operations that changed the repo
:<godiard> bernie: ok
:<godiard> bernie: i have one checkout and one clone
:<Quozl> i have a clone of mainline.git to which i did a fetch of quozl.git then a rebase quozl/master.
:<Quozl> i see, yes, reflog shows one checkout (most recent) and one clone (least recent).
:<bernie> Quozl: reflog sometimes does not show the exact operation you did. in this case, the checkout is the rebase
:<Quozl> here is the reflog output.
e4e1d7a HEAD@{0}: checkout: moving from master to e4e1d7a25550594f6c8d745203f1c110da400c26^0
3fb9bd6 HEAD@{1}: clone: from git://git.sugarlabs.org/paint/mainline.git