git - Revision history

Umar Sheikh: /* making gitk not ugly */

2009-03-02T11:29:03Z

‎making gitk not ugly

2008-11-22T23:09:25Z

‎Branching

2008-11-05T05:49:25Z

‎making gitk not ugly

2008-02-12T06:50:02Z

2008-02-11T20:35:19Z

‎How we use git

2008-02-11T20:14:16Z

‎How we use git

2008-02-11T20:04:23Z

‎How we use git

2008-02-11T19:28:07Z

‎Branching

2008-02-11T19:27:44Z

2008-02-02T00:38:08Z

‎How we use git

@@ Line 98: / Line 98: @@
 ...
 (if necessary)
-git commit -m "succcessfully merged BRANCH-TO-MERGE-FROM into BRANCH-TO-MERGE-TO"
+git commit -m "successfully merged BRANCH-TO-MERGE-FROM into BRANCH-TO-MERGE-TO"
 </pre>

@@ Line 178: / Line 178: @@
   set diffcolors {red "#00a000" blue}
   set permviews {}
 ==Make a new Shared Repository==

@@ Line 26: / Line 26: @@
 | Git rebase -i
 |}
 == Configure ==

@@ Line 24: / Line 24: @@
 | Pull from live by hand into the branch as you are working.  Pull into live.  Fix any conflicts.  Run the test suite.  Push into live.  Deploy.
+|
+| Git rebase -i
 |}

@@ Line 9: / Line 9: @@
 | Use [[Capistrano]] recipe to invoke git on each production server. (1) clone the live repository into a new, never again touched repo (uniquely numbered) (2) symlink "current" to the new numbered repo
+|
-| Tag the commits, use git archive on the tag, or if we use tags we can browse our history forward or backward
+| Tag the commits, use git archive on the tag, or if we use tags we can browse our history forward or backward ... or do a lightweight clone git clone -s (--shared) or something like that so that it uses the first clone's object tree
 |-
 | '''Branching'''
 | Create an entirely new repository using git clone on repository coordination server we call this a branch
+|
+| branches are really a name for a commit ... commits on top of commits ... names are illusionary ... work in a way that linearizes commits  (use rebase) use git fetch, never pull (get rid of it from your vocabulary) ... git pull is fetch plus merge ... get rid of merge from your vocabulary
 |-
 | '''Staging'''

← Older revision	Revision as of 11:29, 2 March 2009
(No difference)

@@ Line 30: / Line 30: @@
   $ git config --global user.name "Your Name Comes Here"
   $ git config --global user.email <email>d6cf6468eaaa81b2b5a09265ab049b91</email>
 == .gitrc ==

@@ Line 22: / Line 22: @@
 |-
 | '''Merging'''
+| Pull from live by hand into the branch as you are working.  Pull into live.  Fix any conflicts.  Run the test suite.  Push into live.  Deploy.
+|
+|