Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2010-07-15 | 1 | -0/+9 |
|\ | |||||
| * | Documentation: add submodule.* to the big configuration variable list | Jonathan Nieder | 2010-07-15 | 1 | -0/+9 |
* | | Merge branch 'maint' | Junio C Hamano | 2010-07-13 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | format-patch: document the format.to configuration setting | Miklos Vajna | 2010-07-13 | 1 | -2/+4 |
| * | Merge branch 'jn/notes-doc' into maint | Junio C Hamano | 2010-06-21 | 1 | -11/+5 |
| |\ | |||||
| * \ | Merge branch 'bg/send-email-smtpdomain' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+1 |
| |\ \ | |||||
* | \ \ | Merge branch 'ar/decorate-color' | Junio C Hamano | 2010-06-30 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Allow customizable commit decorations colors | Nazri Ramliy | 2010-06-24 | 1 | -0/+5 |
* | | | | | Merge branch 'sb/format-patch-signature' | Junio C Hamano | 2010-06-22 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | format-patch: Add a signature option (--signature) | Stephen Boyd | 2010-06-16 | 1 | -0/+6 |
* | | | | | | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 | 1 | -22/+31 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 | 1 | -14/+21 |
| * | | | | | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-19 | 1 | -7/+9 |
| * | | | | | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 1 | -2/+2 |
* | | | | | | Merge branch 'ec/diff-noprefix-config' | Junio C Hamano | 2010-06-18 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | diff: add configuration option for disabling diff prefixes. | Eli Collins | 2010-05-18 | 1 | -0/+2 |
* | | | | | | Merge branch 'jn/notes-doc' | Junio C Hamano | 2010-06-13 | 1 | -11/+5 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Documentation/notes: document format of notes trees | Jonathan Nieder | 2010-05-08 | 1 | -11/+5 |
* | | | | | | Merge branch 'wp/pretty-enhancement' | Junio C Hamano | 2010-06-13 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pretty: add aliases for pretty formats | Will Palmer | 2010-05-03 | 1 | -0/+10 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-31 | 1 | -0/+7 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2010-05-31 | 1 | -0/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | Documentation/config: describe status.submodulesummary | Michael J Gruber | 2010-05-28 | 1 | -0/+7 |
* | | | | | | | Merge branch 'st/remote-tags-no-tags' | Junio C Hamano | 2010-05-21 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Honor "tagopt = --tags" configuration option | Samuel Tardieu | 2010-04-19 | 1 | -1/+3 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/maint-no-reflog-expire-unreach-for-head' | Junio C Hamano | 2010-05-21 | 1 | -2/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Document gc.<pattern>.reflogexpire variables | Junio C Hamano | 2010-04-14 | 1 | -2/+8 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Documentation: fix minor inconsistency | Michael J Gruber | 2010-05-18 | 1 | -1/+1 |
* | | | | | | | Merge branch 'bg/send-email-smtpdomain' | Junio C Hamano | 2010-05-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | send-email: Cleanup smtp-domain and add config | Brian Gernhardt | 2010-04-10 | 1 | -0/+1 |
* | | | | | | | Merge branch 'sd/log-decorate' | Junio C Hamano | 2010-05-08 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add `log.decorate' configuration variable. | Steven Drake | 2010-02-17 | 1 | -0/+7 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'cw/ws-indent-with-tab' | Junio C Hamano | 2010-05-08 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | whitespace: add tab-in-indent error class | Chris Webb | 2010-04-02 | 1 | -0/+2 |
* | | | | | | | Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef | Leif Arne Storset | 2010-05-07 | 1 | -4/+4 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge branch 'wp/doc-filter-direction' | Junio C Hamano | 2010-04-18 | 1 | -4/+4 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | documentation: clarify direction of core.autocrlf | Will Palmer | 2010-04-17 | 1 | -4/+4 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | |||||
| * | | | | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 | Jay Soffian | 2010-04-13 | 1 | -1/+1 |
* | | | | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 1 | -2/+51 |
|\ \ \ \ \ | |||||
| * | | | | | notes: implement helpers needed for note copying during rewrite | Thomas Rast | 2010-03-12 | 1 | -0/+30 |
| * | | | | | Support showing notes from more than one notes tree | Thomas Rast | 2010-03-12 | 1 | -2/+21 |
* | | | | | | Merge branch 'ml/color-grep' | Junio C Hamano | 2010-03-20 | 1 | -3/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | grep: Colorize selected, context, and function lines | Mark Lodato | 2010-03-08 | 1 | -0/+6 |
| * | | | | | | grep: Colorize filename, line number, and separator | Mark Lodato | 2010-03-08 | 1 | -3/+17 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Documentation: receive.denyCurrentBranch defaults to 'refuse' | Thomas Rast | 2010-03-17 | 1 | -1/+1 |
| * | | | | | Merge branch 'jc/checkout-detached' into maint | Junio C Hamano | 2010-03-08 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'sd/init-template' | Junio C Hamano | 2010-03-10 | 1 | -0/+4 |
|\ \ \ \ \ \ \ |