Surviving Git1 min read

Git can feel extremely unnatural to those who came from Bazaar. Only after a lot of advice from friends, the right tools and a few months of intensive usage did I feel confident enough to use it without fear. Many are probably in the same boat as me though, so I took a couple of hours to clean up my personal notes and make a proper “crash course” tutorial for Git in the Pitivi context. I have also made a nice video on how to use interactive rebase, if you’re interested.

Jeff

Comments

6 responses to “Surviving Git”

  1. Matthew Barnes Avatar
    Matthew Barnes

    The “git-new-workdir” utility that ships in git’s “contrib/workdir” directory might be worth special mention. It allows you to have multiple working directories for a git repo instead of just one, which is great if you’re frequently switching between branches. I typically keep one working directory per branch: one for “master”, another for the latest stable branch, and additional ones for any feature branches I’m hacking on.
    Coming from a CVS/Subversion background, git and it’s one-branch-at-a-time model felt very confining to me until I discovered that tool.

  2. Thanks !
    Coming mostly from svn/bazaar-ng, I feel a little lost sometimes when working with git.

  3. mark Avatar
    mark

    bazaar is completely broken
    luckily only canonical uses it
    greetings

  4. @mark: I still find bazaar to be a nice tool that is elegant in its simplicity. I do think many people outside Canonical like it, although they’re certainly not a majority.
    I can’t say that my mind hasn’t been corrupt by the absolute power of “git rebase -i” in recent times, though.

  5. David Laban Avatar
    David Laban

    When I read “feel confident enough to use it without fear” I immediately thought of this:
    “Being aware of git reflog will make you feel that much more comfortable when running commands that alter history. Just remember, as long as you’ve committed it, it’s still there!”
    http://gitfu.wordpress.com/2008/04/06/git-reflog-no-commits-left-behind/

  6. Yeah, I know of the existence of git reflog (actually used it for the first time yesterday). Still, that’s for when you already understand git 🙂