Changes between Version 1 and Version 2 of GitWorkflow
- Timestamp:
- 03/22/09 01:05:00 (4 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
GitWorkflow
v1 v2 3 3 [[PageOutline]] 4 4 5 6 7 = Common scenario = 8 9 Those scenario are the basics - they are written to minimize as much as possible disruption from the common svn workflows. They are not necessarily the best ways to do a specific task under git, but they are the least surprising for someone used to git. 10 11 == Scenario 0: setting up git == 12 13 === Installation === 5 = Installation = 14 6 15 7 Please do not use any version of git below 1.5.3. 16 8 17 == == Linux ====9 == Linux == 18 10 19 11 Git is included in most linux distributions (git-core on Ubuntu). 20 12 21 == == Mac OS X ====13 == Mac OS X == 22 14 23 15 Reasonably up to date binary installers can be found here: http://code.google.com/p/git-osx-installer/. 24 16 25 Installing git itself from sources is easy, but installing the documentation (man, html and info) is a PITA, with many dependencies (asciidoc, etc...). So avoid it if you don't want to go through the hassle.26 27 == == Windows ====17 Installing git itself from sources is easy, xcode should give you everything which is needed, but installing the documentation (man, html and info) is a PITA, with many dependencies (asciidoc, etc...). So avoid it if you don't want to go through the hassle. 18 19 == Windows == 28 20 29 21 There are two easy ways to install git: the native installer or the cygwin installer. Unless you are a regular user of cygwin, the native installer is the best choice. It can be found there: http://code.google.com/p/msysgit/ 30 22 31 == = GUI ===23 == GUI == 32 24 33 25 Git has a basic TK-based GUI, called gitk. It works well to navigate the history. There are native UI for git for most platforms, including windows and mac os X: … … 36 28 * gitx (native mac os X client): http://gitx.frim.nl 37 29 38 === basic configuration === 30 = Before starting = 31 32 == Basic configuration == 39 33 40 34 At minimum, set up your name and email, so that they appear correctly for commits: … … 53 47 }}} 54 48 55 === Getting help from the command line === 56 57 Git documentation is pretty massive - it can definitely be difficult to apprehend. Once you have a good grasp of the basic scenario, you should familiarize yourself with git from the git tutorial, and git for svn users. Only then will you be able to start reading the git included help. 49 == Getting help from the command line == 50 51 Git documentation is pretty massive - it can definitely be difficult to apprehend, as it is meant to be exhaustive and reference-like. This page is intented to help you through the first steps. The suggested way is as follows: 52 53 * Read this page. 54 * Once you have a good grasp of the basic scenario, you could either go to [[http://git-scm.com/course/svn.html git for svn users]], or to the [[http://www.kernel.org/pub/software/scm/git/docs/everyday.html git tutorial]] for a more "git-oriented" introduction. 55 * Then the git manpages should be less daunting. 56 57 Note: as using svn did not require you to read the svn book, using git does not require reading all those material. It is hoped that this page is more than enough for development in numpy. 58 59 = Common scenario = 60 61 Those scenario are the basics - they are written to minimize as much as possible disruption from the common svn workflows. They are not necessarily the best ways to do a specific task under git, but they are the least surprising for someone used to svn. 62 63 == Scenario 0: setting up git == 64 58 65 59 66 == Scenario 1: getting the numpy source code ==
