Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2010-09-10 | 1 | -2/+3 |
|\ | |||||
| * | config.txt: fix placement of diff.noprefix | Mark Lodato | 2010-09-10 | 1 | -2/+3 |
| * | Merge branch 'dj/fetch-tagopt' into maint | Junio C Hamano | 2010-09-01 | 1 | -1/+3 |
| |\ | |||||
| * \ | Merge branch 'vs/doc-spell' into maint | Junio C Hamano | 2010-08-20 | 1 | -5/+7 |
| |\ \ | |||||
* | \ \ | Merge branch 'kf/askpass-config' | Junio C Hamano | 2010-09-08 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | Extend documentation of core.askpass and GIT_ASKPASS. | Knut Franke | 2010-08-31 | 1 | -2/+5 |
| * | | | | Add a new option 'core.askpass'. | Anselm Kruis | 2010-08-31 | 1 | -0/+6 |
* | | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-09-04 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | checkout: Add test for diff.ignoreSubmodules | Jens Lehmann | 2010-08-30 | 1 | -1/+2 |
* | | | | | | Merge branch 'jn/doc-backslash' | Junio C Hamano | 2010-09-03 | 1 | -4/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: tweak description of log.date | Jonathan Nieder | 2010-08-20 | 1 | -4/+5 |
* | | | | | | | Merge branch 'dj/fetch-tagopt' | Junio C Hamano | 2010-08-31 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | fetch: allow command line --tags to override config | Daniel Johnson | 2010-08-14 | 1 | -1/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'hv/autosquash-config' | Junio C Hamano | 2010-08-31 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add configuration variable for --autosquash option of interactive rebase | Heiko Voigt | 2010-07-14 | 1 | -0/+3 |
* | | | | | | | Typos in code comments, an error message, documentation | Ralf Wildenhues | 2010-08-22 | 1 | -1/+1 |
* | | | | | | | Merge branch 'so/http-user-agent' | Junio C Hamano | 2010-08-21 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Allow HTTP user agent string to be modified. | Spencer E. Olson | 2010-08-11 | 1 | -0/+9 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-08-18 | 1 | -0/+18 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Add the 'diff.ignoreSubmodules' config setting | Johannes Schindelin | 2010-08-09 | 1 | -1/+6 |
| * | | | | | Submodules: Use "ignore" settings from .gitmodules too for diff and status | Jens Lehmann | 2010-08-09 | 1 | -0/+3 |
| * | | | | | Submodules: Add the new "ignore" config option for diff and status | Jens Lehmann | 2010-08-09 | 1 | -0/+10 |
| |/ / / / | |||||
* | | | | | Merge branch 'vs/doc-spell' | Junio C Hamano | 2010-08-18 | 1 | -5/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Documentation: spelling fixes | Ville Skyttä | 2010-07-20 | 1 | -5/+7 |
| |/ / | |||||
* | | | Document receive.denyDeleteCurrent | Thomas Rast | 2010-07-25 | 1 | -0/+4 |
|/ / | |||||
* | | 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 |
| | |_|/ / / / | |/| | | | | |