Re: for newbs = little exercise / tutorial / warmup for windows and other non-sophisticated new Git users :-)
- From
- Jeff Whiteside <jeff.m.whiteside@gmail.com>
- Date
- Dec 30, 2008, 05:33 UTC
- Message-ID
- <3ab397d0812292133r7955e892g6c19ca46629e7103@mail.gmail.com>
- In-Reply-To
- <gjc7qa$jdj$4@ger.gmane.org>
> Thanks for your contrib. I'll pick these up for sure, but right now I'm > despo to make some progress getting this confounded real-life project > versioned.
np, i do understand totally.
> I've just made a commit I want to retract.
this is the purpose of git reset --soft/mixed/hard
> I have been using $ git reset --hard <version> as an escalator to ascend / > descend the versions up and down
you should probably be using git checkout for this
> Surely it doesn't alter the history, as I can commit versionA, versionB, > versionC, and then reset to A, then reset to C, then reset to B.
i does alter the history. i think this works because git isnt' deleting the actual blob objects in the git dir until you use the git prune, or gc or whatever (i never use it anyway). but, you are altering history, and just happen to be recovering.
> so when I reset to A, I've still got the ability to get to B or C again
with an uneasy conscience ;)
> Now I appreciate that if I commit a new change from versionA (lets call it > B1), then HEAD is now at B1, and B, C etc are lost, correct ?
yes! but this is not true if you had done a git checkout (there are measures to recover B and C, provided you haven't done a prune. i think git reflog has some answers here, but i'm still a newbie).
> Its pertinent to where I am right now, as I've goofed a commit, and want to > reset, and commit again but I'm worried about leaveing garbage lying around > (the commits for version B and C in the example above).
you've goofed what commit (a1?, c?, d3?)? where are you now and what do you want to do now? reset to what version? if you're just worried about space used by B and C, i think git prune will purge these (look at man page, don't guess at the syntax).
i half suspect that you want to git branch at some point, but if yo'ure just recretaing the other code bases' history form other files, you shouldn't be able to break too much by git reset --hard, or git prune.
> BTW: sdf=Syntax Definition Formalism?
hahahaha, no, i was just typing/copypasting garbage, because my gmail woudln't' get out of bold mode and forgot to delete it at the end. haha.
On Mon, Dec 29, 2008 at 8:24 PM, Zorba <cr@altmore.co.uk> wrote:
Show 100 quoted lines
> Hi Jeff, > > Thanks for your contrib. I'll pick these up for sure, but right now I'm > despo to make some progress getting this confounded real-life project > versioned. > > But where I'm stuck now touches on your post. > > I've just made a commit I want to retract. > > I have been using $ git reset --hard <version> as an escalator to ascend / > descend the versions up and down > Surely it doesn't alter the history, as I can commit versionA, versionB, > versionC, and then reset to A, then reset to C, then reset to B. > > so when I reset to A, I've still got the ability to get to B or C again > > Now I appreciate that if I commit a new change from versionA (lets call it > B1), then HEAD is now at B1, and B, C etc are lost, correct ? > > Its pertinent to where I am right now, as I've goofed a commit, and want to > reset, and commit again but I'm worried about leaveing garbage lying around > (the commits for version B and C in the example above). > > NB if you read my latest posts you will see why I chose the example I did > for my "warm-up" as it closely models what I'm trying to do for real. > > > BTW: sdf=Syntax Definition Formalism? > > "Jeff Whiteside" <jeff.m.whiteside@gmail.com> wrote in message > news:3ab397d0812291505v77824e6fvdecebc80f38a5f89@mail.gmail.com... > > -"Rollback to each of the versions, starting with version A" > this is bad. you're saying rollback. to others that have used scms, > this will mean, "retrieve an older copy", but in git, this is DELETING > all the versions after the version that you "rollback" to. your blog > post shouldn't discuss the git-reset --hard command at all, since > you're rewriting history, which is dangerous. afaik, most scms don't > allow you to rewrite history. to "rollback" to an older version you > should use checkout the git-checkout command. maybe the git reset > -–hard HEAD is okay to include... but it won't be immediately obvious > to new users why it does what it does... this nomenclature was likely > not the best choice whenever it was made. > > > gl with your gitting. > > whiteside > > > > > u're talking sdf > > > > > On Sat, Dec 27, 2008 at 5:29 PM, Zorba <cr@altmore.co.uk> wrote: >> >> tidied up the formatting, added a few more comments where needed, fixed >> errors/lack of clarity >> >> "Zorba" <cr@altmore.co.uk> wrote in message >> news:gj68a0$u56$3@ger.gmane.org... >> > Here is a little exercise / tutorial / warm-up for someone starting out >> > with Git. If you're anyting like me you may find the tutorials etc. on >> > git.or.cz a bit daunting. I recommend you try this after reading the >> > user >> > manual but before tearing your hair out trying to follow all the >> > examples >> > in the user manual. After you've followed this simple workflow, then go >> > back to the more advanced stuff in the tutorials and user manuals (like >> > cloning repositories and creating and merging branches). >> > >> > I created this exercise to try and model our workflow and what we wanted >> > to use git for = tracking a project with multiple files where the >> > filebase >> > might change frequently from one version to the next. >> > >> > http://siliconmouth.wordpress.com/category/nerdy/ >> > >> > look for December 27, 2008 or "git warmup" >> > >> > >> >> >> >> -- >> To unsubscribe from this list: send the line "unsubscribe git" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >