Skip to main content

Scott Moody's Library tagged git   View Popular

06 Jun 08

Newbie: report of first experience with git-rebase. | KernelTrap

I've made my first attempt at tracking my changes to upstream git
repository using git-fetch/git-rebase workflow. I did three commits to
my master branch, and then upstream incorporated two of them in slightly
modified form, so that some conflicts are to be expected. I did
git-fetch followed by git-rebase, and finally have got the end result I
hoped for, but there were some confusion along the way. I think I'd post
the log of the session here along with my thoughts so that an interested
person could see how it works for a newbie (my thoughts and non-git
actions at the time of rebasing are marked with 'me>' prefix):

kerneltrap.org/...373985 - Preview

git github howto tutorial lessons workflow

05 Jun 08

*** My Git Workflow | Oliver Steele

Git‘s great! But it’s difficult to learn (it was for me, anyway) — especially the index, which unlike the power-user features, comes up in day-to-day operation.

Here’s my path to enlightment, and how I ended up using the index in my particular workflow. There are other workflows, but this one is mine.

What this isn’t: a Git tutorial. It doesn’t tell you how to set up git, or use it. I don’t cover branches, or merging, or tags, or blobs. There are dozens of really great articles about Git on the web; here are some. What’s here are just some pictures that aren’t about branches or blobs, that I wished I’d been able to look at six months ago when I was trying to figure this stuff out; I still haven’t seen them elsewhere, so here they are now.

osteele.com/...my-git-workflow - Preview

git overview workflow howto tutorial 5star

  • My Git Workflow



    Posted by oliver

    Sat, 05/10/2008 - 01:01



    Git‘s great! But it’s difficult to learn (it was for me, anyway) — especially the index, which unlike the power-user features, comes up in day-to-day operation.



    Here’s my path to enlightment, and how I ended up using the index in my particular workflow. There are other workflows, but this one is mine.



    What this isn’t: a Git tutorial. It doesn’t tell you how to set up git, or use it. I don’t cover branches, or merging, or tags, or blobs. There are dozens of really great articles about Git on the web; here are some. What’s here are just some pictures that aren’t about branches or blobs, that I wished I’d been able to look at six months ago when I was trying to figure this stuff out; I still haven’t seen them elsewhere, so here they are now.

Google Open Source Blog: Develop with Git on a Google Code Project

Develop with Git on a Google Code Project
Tuesday, May 20, 2008 at 8:48 AM
By Benjamin Lynn, Google Developer Programs

Do you often work offline? Wish you could make local commits that you can reorganize and upload later? Would you like to have your own copy of the entire history of the project which you can peruse at your leisure?

Do you want to serve code and its history to others? Have changes you want to share but it's too early for the public?

Working on several issues in parallel? Need to save some of those experimental changes after all? Need to create, merge, clone and otherwise manipulate branches cheaply and offline?

You can do all this, and more, with Git, a version control system rapidly growing in popularity. You can readily find Git tutorials, but since I'm writing this post, I'll shamelessly plug my own guide to Git!

Although Google Code natively speaks Subversion, you can easily use Git during development. Searching for "git svn" suggests this practice is widespread, and we too encourage you to experiment with it.

We focus on importing a complete Git repository from a Google Code project organized in the recommended fashion. The git-svn manpage thoroughly describes how to handle other cases such as nonstandard layouts, importing only a few revisions, sharing exported repositories, and so on.

google-opensource.blogspot.com/...it-on-google-code-project.html - Preview

git svn howto google tutorial

***** Git Magic - A COMPLETE GIT GUIDE

Git is a version control Swiss army knife. A reliable versatile multipurpose revision control tool whose extraordinary flexibility makes it tricky to learn, let alone master. I'm recording what I've figured out so far in these pages, because I initially had difficulty understanding the Git user manual.

As Arthur C. Clarke observed, any sufficiently advanced technology is indistinguishable from magic. This is a great way to approach Git: newbies can ignore its inner workings and view Git as a gizmo that can amaze friends and infuriate enemies with its wondrous abilities.

Rather than go into details, we provide rough instructions for particular effects. After repeated use, gradually you will understand how each trick works, and how to tailor the recipes for your needs.

www-cs-students.stanford.edu/...gitmagic - Preview

git howto tutorial 5star overview github

****Git from the bottom up | Git | New Artisans LLC

    • Git from the bottom up




      In my pursuit to understand Git, it’s been helpful for me to
      understand it from the bottom up — rather than look at it only in
      terms of its high-level commands. And since Git is so beautifully
      simple when viewed this way, I thought others might be interested
      to read what I’ve found, and perhaps avoid the pain I went through
      finding it.


      The
      following article
      offers what I’ve learned on this journey so
      far. I hope it can help others to comprehend this wonderful system,
      and discover some of the joy I’ve experienced in the past few
      weeks.


      Here is a summary from the table of contents:


      • Introduction
      • Repository: Directory content tracking
      • Introducing the blob
      • Blobs are stored in trees
      • How trees are made
      • The beauty of commits
      • A commit by any other name…
      • Branching and the power of rebase
      • Index Cache: Meet the middle man
      • Taking the index cache farther
      • To reset, or not to reset
      • Last links in the chain: Stashing and the reflog
  • In my pursuit to understand Git, it’s been helpful for me to
    understand it from the bottom up – rather than look at it only in
    terms of its high-level commands. And since Git is so beautifully
    simple when viewed this way, I thought others might be interested
    to read what I’ve found, and perhaps avoid the pain I went through
    finding it.


    The
    following article
    offers what I’ve learned on this journey so
    far. I hope it can help others to comprehend this wonderful system,
    and discover some of the joy I’ve experienced in the past few
    weeks. NOTE: After receiving more than fifty
    corrections by e-mail from very helpful readers, I’ve updated the
    PDF to reflect their input. The date at the front should read “Fri,
    2 May 2008” if you have the latest version.

Railscasts - Git on Rails

  • Git has been getting a lot of buzz lately, and for good reason. It's an excellent SCM which in many ways is more simple and powerful than subversion. See how to set up a Rails project with Git in this episode.
1 - 20 of 53 Next › Last »
Showing 20 items per page

Highlighter, Sticky notes, Tagging, Groups and Network: integrated suite dramatically boosting research productivity. Learn more »

Join Diigo