Skip to content

Instantly share code, notes, and snippets.

@mattd

mattd/gist:5354661

Last active March 23, 2016 13:06
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save mattd/5354661 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save mattd/5354661 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. mattd revised this gist Apr 10, 2013. 2 changed files with 27 additions and 0 deletions.
    0 gistfile1 → gistfile1.txt
    View file
    File renamed without changes.
    27 changes: 27 additions & 0 deletions gistfile2.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,27 @@
    # common workflow

    # get most recent changes from g1nn13
    git fetch
    git merge origin/master

    # make a new topic branch
    git checkout -b new-modal

    # do some work

    # check in your work
    git commit -am "Make the modal more better."

    # either merge locally...
    git checkout master
    git merge new-modal

    # ...and push to your repo's master
    git push mattd master

    # then submit a pull request for master -> master

    # ...or push your topic branch to github
    git push mattd new-modal

    # then submit a pull request for new-modal -> master
  2. mattd created this gist Apr 10, 2013.
    15 changes: 15 additions & 0 deletions gistfile1
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,15 @@
    [core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
    ignorecase = true
    [remote "origin"]
    fetch = +refs/heads/*:refs/remotes/origin/*
    url = [email protected]:g1nn13/jakarta
    [branch "master"]
    remote = origin
    merge = refs/heads/master
    [remote "mattd"]
    fetch = +refs/heads/*:refs/remotes/mattd/*
    url = [email protected]:mattd/jakarta