Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Mention "local convention" rule in the CodingGuidelines | Nanako Shiraishi | 2009-01-26 | 1 | -2/+7 |
* | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2009-01-25 | 1 | -0/+13 |
|\ | |||||
| * | git-svn: documented --ignore-paths | Vitaly \"_Vi\" Shukela | 2009-01-25 | 1 | -0/+13 |
* | | gittutorial: remove misleading note | Miklos Vajna | 2009-01-25 | 1 | -3/+1 |
* | | Merge branch 'js/diff-color-words' | Junio C Hamano | 2009-01-25 | 3 | -2/+43 |
|\ \ | |||||
| * | | Change the spelling of "wordregex". | Boyd Stephen Smith Jr | 2009-01-21 | 2 | -3/+3 |
| * | | color-words: Support diff.wordregex config option | Boyd Stephen Smith Jr | 2009-01-21 | 2 | -3/+10 |
| * | | color-words: make regex configurable via attributes | Thomas Rast | 2009-01-17 | 2 | -0/+25 |
| * | | color-words: expand docs with precise semantics | Thomas Rast | 2009-01-17 | 1 | -5/+10 |
| * | | color-words: take an optional regular expression describing words | Johannes Schindelin | 2009-01-17 | 1 | -1/+5 |
* | | | diff-options.txt: Fix asciidoc markup issue | Teemu Likonen | 2009-01-25 | 1 | -1/+1 |
* | | | Sync with 1.6.1.1 | Junio C Hamano | 2009-01-25 | 2 | -8/+19 |
|\ \ \ | |_|/ |/| | | |||||
| * | | GIT 1.6.1.1v1.6.1.1 | Junio C Hamano | 2009-01-25 | 1 | -7/+17 |
* | | | Merge branch 'js/patience-diff' | Junio C Hamano | 2009-01-23 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | Introduce the diff option '--patience' | Johannes Schindelin | 2009-01-07 | 1 | -0/+3 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-23 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'am/maint-push-doc' into maint | Junio C Hamano | 2009-01-23 | 1 | -7/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-23 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix Documentation for git-describe | Boyd Stephen Smith Jr | 2009-01-23 | 1 | -1/+1 |
* | | | | | | git-am: implement --reject option passed to git-apply | martin f. krafft | 2009-01-23 | 1 | -0/+2 |
* | | | | | | Merge branch 'am/maint-push-doc' | Junio C Hamano | 2009-01-21 | 1 | -7/+8 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Documentation: avoid using undefined parameters | Anders Melchiorsen | 2009-01-18 | 1 | -2/+2 |
| * | | | | | Documentation: mention branches rather than heads | Anders Melchiorsen | 2009-01-18 | 1 | -2/+2 |
| * | | | | | Documentation: remove a redundant elaboration | Anders Melchiorsen | 2009-01-18 | 1 | -2/+1 |
| * | | | | | Documentation: git push repository can also be a remote | Anders Melchiorsen | 2009-01-18 | 1 | -1/+3 |
* | | | | | | Merge branch 'sb/hook-cleanup' | Junio C Hamano | 2009-01-21 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | run_hook(): allow more than 9 hook arguments | Stephan Beyer | 2009-01-17 | 1 | -1/+1 |
| * | | | | | | api-run-command.txt: talk about run_hook() | Stephan Beyer | 2009-01-17 | 1 | -0/+15 |
* | | | | | | | Merge branch 'jk/color-parse' | Junio C Hamano | 2009-01-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | expand --pretty=format color options | Jeff King | 2009-01-17 | 1 | -0/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'kb/am-directory' | Junio C Hamano | 2009-01-21 | 1 | -5/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-am: add --directory=<dir> option | Junio C Hamano | 2009-01-12 | 1 | -5/+2 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Rename diff.suppress-blank-empty to diff.suppressBlankEmpty | Johannes Schindelin | 2009-01-21 | 1 | -1/+1 |
* | | | | | | | | tutorial-2: Update with the new "git commit" ouput | Santi BĂ©jar | 2009-01-21 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-19 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | shell: Document that 'cvs server' is a valid command | Lars Noschinski | 2009-01-19 | 1 | -2/+3 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | git-svn: Add --localtime option to "fetch" | Pete Harlan | 2009-01-18 | 1 | -0/+11 |
* | | | | | | | Merge branch 'mv/apply-parse-opt' | Junio C Hamano | 2009-01-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | parse-opt: migrate builtin-apply. | Miklos Vajna | 2008-12-30 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'tr/rebase-root' | Junio C Hamano | 2009-01-17 | 1 | -5/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase: update documentation for --root | Thomas Rast | 2009-01-11 | 1 | -5/+16 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-17 | 3 | -3/+11 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Update draft release notes for 1.6.1.1 | Junio C Hamano | 2009-01-17 | 1 | -1/+6 |
| * | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-17 | 2 | -2/+5 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Documentation: let asciidoc align related options | Markus Heidelberg | 2009-01-17 | 1 | -1/+4 |
| | * | | | | | | githooks.txt: add missing word | Stephan Beyer | 2009-01-17 | 1 | -1/+1 |
* | | | | | | | | Documentation: let asciidoc align related options | Markus Heidelberg | 2009-01-17 | 1 | -2/+4 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-14 | 1 | -2/+23 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Update draft release notes to 1.6.1.1 | Junio C Hamano | 2009-01-14 | 1 | -2/+23 |