{ "__type": "IngestedDoc", "__tag": 4010, "_content": {}, "_ordered_sections": [], "item_file": null, "item_line": null, "item_type": null, "aliases": [], "example_section_data": { "__type": "Section", "__tag": 4015, "children": [], "title": [], "level": 0, "target": null }, "see_also": [], "signature": null, "references": null, "qa": "gitwash:configure_git", "arbitrary": [ { "__type": "Section", "__tag": 4015, "children": [], "title": [ { "__type": "Text", "__tag": 4046, "value": "Configure git" } ], "level": 0, "target": "configure-git" }, { "__type": "Section", "__tag": 4015, "children": [ { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "Your personal git configurations are saved in the " }, { "__type": "InlineCode", "__tag": 4051, "value": ".gitconfig" }, { "__type": "Text", "__tag": 4046, "value": " file in your home directory." } ] }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "Here is an example " }, { "__type": "InlineCode", "__tag": 4051, "value": ".gitconfig" }, { "__type": "Text", "__tag": 4046, "value": " file " } ] }, { "__type": "Code", "__tag": 4050, "value": "[user]\n name = Your Name\n email = you@yourdomain.example.com\n\n[alias]\n ci = commit -a\n co = checkout\n st = status\n stat = status\n br = branch\n wdiff = diff --color-words\n\n[core]\n editor = vim\n\n[merge]\n summary = true", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "You can edit this file directly or you can use the " }, { "__type": "InlineCode", "__tag": 4051, "value": "git config --global" }, { "__type": "Text", "__tag": 4046, "value": " command " } ] }, { "__type": "Code", "__tag": 4050, "value": "git config --global user.name \"Your Name\"\ngit config --global user.email you@yourdomain.example.com\ngit config --global alias.ci \"commit -a\"\ngit config --global alias.co checkout\ngit config --global alias.st \"status -a\"\ngit config --global alias.stat \"status -a\"\ngit config --global alias.br branch\ngit config --global alias.wdiff \"diff --color-words\"\ngit config --global core.editor vim\ngit config --global merge.summary true", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "To set up on another computer, you can copy your " }, { "__type": "InlineCode", "__tag": 4051, "value": "~/.gitconfig" }, { "__type": "Text", "__tag": 4046, "value": " file, or run the commands above." } ] } ], "title": [ { "__type": "Text", "__tag": 4046, "value": "Overview" } ], "level": 1, "target": "git-config-basic" }, { "__type": "Section", "__tag": 4015, "children": [], "title": [ { "__type": "Text", "__tag": 4046, "value": "In detail" } ], "level": 1, "target": null }, { "__type": "Section", "__tag": 4015, "children": [ { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "It is good practice to tell " }, { "__type": "InlineRole", "__tag": 4003, "value": "git_", "domain": null, "role": null, "inventory": null }, { "__type": "Text", "__tag": 4046, "value": " who you are, for labeling any changes you make to the code. The simplest way to do this is from the command line " } ] }, { "__type": "Code", "__tag": 4050, "value": "git config --global user.name \"Your Name\"\ngit config --global user.email you@yourdomain.example.com", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "This will write the settings into your git configuration file, which should now contain a user section with your name and email " } ] }, { "__type": "Code", "__tag": 4050, "value": "[user]\n name = Your Name\n email = you@yourdomain.example.com", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "Of course you'll need to replace " }, { "__type": "InlineCode", "__tag": 4051, "value": "Your Name" }, { "__type": "Text", "__tag": 4046, "value": " and " }, { "__type": "InlineCode", "__tag": 4051, "value": "you@yourdomain.example.com" }, { "__type": "Text", "__tag": 4046, "value": " with your actual name and email address." } ] } ], "title": [ { "__type": "Text", "__tag": 4046, "value": "user.name and user.email" } ], "level": 2, "target": null }, { "__type": "Section", "__tag": 4015, "children": [ { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "You might well benefit from some aliases to common commands." } ] }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "For example, you might well want to be able to shorten " }, { "__type": "InlineCode", "__tag": 4051, "value": "git checkout" }, { "__type": "Text", "__tag": 4046, "value": " to " }, { "__type": "InlineCode", "__tag": 4051, "value": "git co" }, { "__type": "Text", "__tag": 4046, "value": ". Or you may want to alias " }, { "__type": "InlineCode", "__tag": 4051, "value": "git diff --color-words" }, { "__type": "Text", "__tag": 4046, "value": " (which gives a nicely formatted output of the diff) to " }, { "__type": "InlineCode", "__tag": 4051, "value": "git wdiff" } ] }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "The following " }, { "__type": "InlineCode", "__tag": 4051, "value": "git config --global" }, { "__type": "Text", "__tag": 4046, "value": " commands " } ] }, { "__type": "Code", "__tag": 4050, "value": "git config --global alias.ci \"commit -a\"\ngit config --global alias.co checkout\ngit config --global alias.st \"status -a\"\ngit config --global alias.stat \"status -a\"\ngit config --global alias.br branch\ngit config --global alias.wdiff \"diff --color-words\"", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "will create an " }, { "__type": "InlineCode", "__tag": 4051, "value": "alias" }, { "__type": "Text", "__tag": 4046, "value": " section in your " }, { "__type": "InlineCode", "__tag": 4051, "value": ".gitconfig" }, { "__type": "Text", "__tag": 4046, "value": " file with contents like this " } ] }, { "__type": "Code", "__tag": 4050, "value": "[alias]\n ci = commit -a\n co = checkout\n st = status -a\n stat = status -a\n br = branch\n wdiff = diff --color-words", "execution_status": null } ], "title": [ { "__type": "Text", "__tag": 4046, "value": "Aliases" } ], "level": 2, "target": null }, { "__type": "Section", "__tag": 4015, "children": [ { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "You may also want to make sure that your editor of choice is used " } ] }, { "__type": "Code", "__tag": 4050, "value": "git config --global core.editor vim", "execution_status": null } ], "title": [ { "__type": "Text", "__tag": 4046, "value": "Editor" } ], "level": 2, "target": null }, { "__type": "Section", "__tag": 4015, "children": [ { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "To enforce summaries when doing merges (" }, { "__type": "InlineCode", "__tag": 4051, "value": "~/.gitconfig" }, { "__type": "Text", "__tag": 4046, "value": " file again) " } ] }, { "__type": "Code", "__tag": 4050, "value": "[merge]\n log = true", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "Or from the command line " } ] }, { "__type": "Code", "__tag": 4050, "value": "git config --global merge.log true", "execution_status": null } ], "title": [ { "__type": "Text", "__tag": 4046, "value": "Merging" } ], "level": 2, "target": null }, { "__type": "Section", "__tag": 4015, "children": [ { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "This is a very nice alias to get a fancy log output; it should go in the " }, { "__type": "InlineCode", "__tag": 4051, "value": "alias" }, { "__type": "Text", "__tag": 4046, "value": " section of your " }, { "__type": "InlineCode", "__tag": 4051, "value": ".gitconfig" }, { "__type": "Text", "__tag": 4046, "value": " file " } ] }, { "__type": "Code", "__tag": 4050, "value": "lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)[%an]%Creset' --abbrev-commit --date=relative", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "You use the alias with " } ] }, { "__type": "Code", "__tag": 4050, "value": "git lg", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "and it gives graph / text output something like this (but with color!) " } ] }, { "__type": "Code", "__tag": 4050, "value": "* 6d8e1ee - (HEAD, origin/my-fancy-feature, my-fancy-feature) NF - a fancy file (45 minutes ago) [Matthew Brett]\n* d304a73 - (origin/placeholder, placeholder) Merge pull request #48 from hhuuggoo/master (2 weeks ago) [Jonathan Terhorst]\n|\\\n| * 4aff2a8 - fixed bug 35, and added a test in test_bugfixes (2 weeks ago) [Hugo]\n|/\n* a7ff2e5 - Added notes on discussion/proposal made during Data Array Summit. (2 weeks ago) [Corran Webster]\n* 68f6752 - Initial implementation of AxisIndexer - uses 'index_by' which needs to be changed to a call on an Axes object - this is all very sketchy right now. (2 weeks ago) [Corr\n* 376adbd - Merge pull request #46 from terhorst/master (2 weeks ago) [Jonathan Terhorst]\n|\\\n| * b605216 - updated joshu example to current api (3 weeks ago) [Jonathan Terhorst]\n| * 2e991e8 - add testing for outer ufunc (3 weeks ago) [Jonathan Terhorst]\n| * 7beda5a - prevent axis from throwing an exception if testing equality with non-axis object (3 weeks ago) [Jonathan Terhorst]\n| * 65af65e - convert unit testing code to assertions (3 weeks ago) [Jonathan Terhorst]\n| * 956fbab - Merge remote-tracking branch 'upstream/master' (3 weeks ago) [Jonathan Terhorst]\n| |\\\n| |/", "execution_status": null }, { "__type": "Paragraph", "__tag": 4045, "children": [ { "__type": "Text", "__tag": 4046, "value": "Thanks to Yury V. Zaytsev for posting it." } ] }, { "__type": "Target", "__tag": 4061, "label": "PROJECTNAME" }, { "__type": "Target", "__tag": 4061, "label": "PROJECTNAME github" }, { "__type": "Target", "__tag": 4061, "label": "PROJECTNAME mailing list" }, { "__type": "Target", "__tag": 4061, "label": "numpy" }, { "__type": "Target", "__tag": 4061, "label": "numpy github" }, { "__type": "Target", "__tag": 4061, "label": "numpy mailing list" }, { "__type": "Target", "__tag": 4061, "label": "scipy" }, { "__type": "Target", "__tag": 4061, "label": "scipy github" }, { "__type": "Target", "__tag": 4061, "label": "scipy mailing list" }, { "__type": "Target", "__tag": 4061, "label": "nipy" }, { "__type": "Target", "__tag": 4061, "label": "nipy github" }, { "__type": "Target", "__tag": 4061, "label": "nipy mailing list" }, { "__type": "Target", "__tag": 4061, "label": "ipython" }, { "__type": "Target", "__tag": 4061, "label": "ipython github" }, { "__type": "Target", "__tag": 4061, "label": "ipython mailing list" }, { "__type": "Target", "__tag": 4061, "label": "dipy" }, { "__type": "Target", "__tag": 4061, "label": "dipy github" }, { "__type": "Target", "__tag": 4061, "label": "dipy mailing list" }, { "__type": "Target", "__tag": 4061, "label": "nibabel" }, { "__type": "Target", "__tag": 4061, "label": "nibabel github" }, { "__type": "Target", "__tag": 4061, "label": "nibabel mailing list" }, { "__type": "Target", "__tag": 4061, "label": "marsbar" }, { "__type": "Target", "__tag": 4061, "label": "marsbar github" }, { "__type": "Target", "__tag": 4061, "label": "MarsBaR mailing list" }, { "__type": "Target", "__tag": 4061, "label": "scikit-image" }, { "__type": "Target", "__tag": 4061, "label": "scikit-image github" }, { "__type": "Target", "__tag": 4061, "label": "scikit-image developer forum" }, { "__type": "Target", "__tag": 4061, "label": "git" }, { "__type": "Target", "__tag": 4061, "label": "github" }, { "__type": "Target", "__tag": 4061, "label": "github help" }, { "__type": "Target", "__tag": 4061, "label": "msysgit" }, { "__type": "Target", "__tag": 4061, "label": "git-osx-installer" }, { "__type": "Target", "__tag": 4061, "label": "subversion" }, { "__type": "Target", "__tag": 4061, "label": "git cheat sheet" }, { "__type": "Target", "__tag": 4061, "label": "pro git book" }, { "__type": "Target", "__tag": 4061, "label": "git svn crash course" }, { "__type": "Target", "__tag": 4061, "label": "learn.github" }, { "__type": "Target", "__tag": 4061, "label": "network graph visualizer" }, { "__type": "Target", "__tag": 4061, "label": "git user manual" }, { "__type": "Target", "__tag": 4061, "label": "git tutorial" }, { "__type": "Target", "__tag": 4061, "label": "git community book" }, { "__type": "Target", "__tag": 4061, "label": "git ready" }, { "__type": "Target", "__tag": 4061, "label": "git casts" }, { "__type": "Target", "__tag": 4061, "label": "Fernando's git page" }, { "__type": "Target", "__tag": 4061, "label": "git magic" }, { "__type": "Target", "__tag": 4061, "label": "git concepts" }, { "__type": "Target", "__tag": 4061, "label": "git clone" }, { "__type": "Target", "__tag": 4061, "label": "git checkout" }, { "__type": "Target", "__tag": 4061, "label": "git commit" }, { "__type": "Target", "__tag": 4061, "label": "git push" }, { "__type": "Target", "__tag": 4061, "label": "git pull" }, { "__type": "Target", "__tag": 4061, "label": "git add" }, { "__type": "Target", "__tag": 4061, "label": "git status" }, { "__type": "Target", "__tag": 4061, "label": "git diff" }, { "__type": "Target", "__tag": 4061, "label": "git log" }, { "__type": "Target", "__tag": 4061, "label": "git branch" }, { "__type": "Target", "__tag": 4061, "label": "git remote" }, { "__type": "Target", "__tag": 4061, "label": "git rebase" }, { "__type": "Target", "__tag": 4061, "label": "git config" }, { "__type": "Target", "__tag": 4061, "label": "why the -a flag?" }, { "__type": "Target", "__tag": 4061, "label": "git staging area" }, { "__type": "Target", "__tag": 4061, "label": "tangled working copy problem" }, { "__type": "Target", "__tag": 4061, "label": "linux git workflow" }, { "__type": "Target", "__tag": 4061, "label": "git parable" }, { "__type": "Target", "__tag": 4061, "label": "git foundation" }, { "__type": "Target", "__tag": 4061, "label": "deleting master on github" }, { "__type": "Target", "__tag": 4061, "label": "rebase without tears" }, { "__type": "Target", "__tag": 4061, "label": "resolving a merge" }, { "__type": "Target", "__tag": 4061, "label": "ipython git workflow" }, { "__type": "Target", "__tag": 4061, "label": "python" } ], "title": [ { "__type": "Text", "__tag": 4046, "value": "Fancy log output" } ], "level": 2, "target": "fancy-log" } ], "local_refs": [] }