Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bw/log-all-ref-updates-doc' | Junio C Hamano | 2011-07-22 | 1 | -1/+3 |
|\ | |||||
| * | Documentation: clearly specify what refs are honored by core.logAllRefUpdates | Bert Wesarg | 2011-07-12 | 1 | -1/+3 |
* | | Merge branch 'jn/doc-dashdash' | Junio C Hamano | 2011-07-13 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash | Junio C Hamano | 2011-06-29 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Documentation: quote double-dash for AsciiDoc | Jonathan Nieder | 2011-06-29 | 1 | -1/+1 |
* | | | | http: pass http.cookiefile using CURLOPT_COOKIEFILE | Duncan Brown | 2011-06-03 | 1 | -0/+8 |
|/ / / | |||||
* | | | Add log.abbrevCommit config variable | Jay Soffian | 2011-05-18 | 1 | -0/+5 |
* | | | Merge branch 'ci/commit--interactive-atomic' | Junio C Hamano | 2011-05-16 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | Add commit to list of config.singlekey commands | Conrad Irwin | 2011-05-09 | 1 | -3/+4 |
* | | | | Merge branch 'vh/config-interactive-singlekey-doc' | Junio C Hamano | 2011-05-11 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | config.txt: 'interactive.singlekey; is used by... | Valentin Haenel | 2011-05-05 | 1 | -2/+3 |
* | | | | Merge branch 'mg/alias-expose-prefix' | Junio C Hamano | 2011-05-06 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | handle_alias: provide GIT_PREFIX to !alias | Michael J Gruber | 2011-04-27 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge branch 'mg/diff-uiconfig-doc' | Junio C Hamano | 2011-05-06 | 1 | -8/+19 |
|\ \ \ \ | |||||
| * | | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diff | Michael J Gruber | 2011-04-27 | 1 | -8/+19 |
| |/ / / | |||||
* | | | | Merge branch 'mz/rebase' | Junio C Hamano | 2011-04-28 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | rebase: use @{upstream} if no upstream specified | Martin von Zweigbergk | 2011-02-10 | 1 | -1/+1 |
* | | | | | Merge branch 'rr/doc-content-type' | Junio C Hamano | 2011-04-27 | 1 | -62/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: Move diff.<driver>.* from config.txt to diff-config.txt | Ramkumar Ramachandra | 2011-04-06 | 1 | -62/+1 |
| * | | | | | Documentation: Add filter.<driver>.* to config | Ramkumar Ramachandra | 2011-04-06 | 1 | -0/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jc/pack-objects-bigfile' | Junio C Hamano | 2011-04-27 | 1 | -2/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Teach core.bigfilethreashold to pack-objects | Junio C Hamano | 2011-04-05 | 1 | -2/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2011-04-04 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Documentation: trivial grammar fix in core.worktree description | SZEDER Gábor | 2011-04-04 | 1 | -1/+1 |
| * | | | Merge branch 'lt/default-abbrev' into maint | Junio C Hamano | 2011-04-03 | 1 | -0/+6 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jl/submodule-fetch-on-demand' | Junio C Hamano | 2011-04-04 | 1 | -4/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option | Jens Lehmann | 2011-03-09 | 1 | -1/+1 |
| * | | | | | config: teach the fetch.recurseSubmodules option the 'on-demand' value | Jens Lehmann | 2011-03-09 | 1 | -3/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jr/grep-en-config' | Junio C Hamano | 2011-04-01 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | grep: allow -E and -n to be turned on by default via configuration | Joe Ratterman | 2011-03-30 | 1 | -0/+6 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Documentation/config.txt: make truth value of numbers more explicit | Carlos Martín Nieto | 2011-03-30 | 1 | -1/+1 |
| * | | | | Merge branch 'jh/push-default-upstream-configname' into maint | Junio C Hamano | 2011-03-16 | 1 | -1/+2 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'lt/default-abbrev' | Junio C Hamano | 2011-03-23 | 1 | -0/+6 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Rename core.abbrevlength back to core.abbrev | Junio C Hamano | 2011-03-20 | 1 | -1/+1 |
| * | | | | | Make the default abbrev length configurable | Linus Torvalds | 2011-03-11 | 1 | -0/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-10 | 1 | -9/+0 |
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| * | | | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" | Junio C Hamano | 2011-03-10 | 1 | -9/+0 |
| |/ / | |||||
* | | | push.default: Rename 'tracking' to 'upstream' | Johan Herland | 2011-02-16 | 1 | -1/+2 |
|/ / | |||||
* | | Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase | Junio C Hamano | 2011-01-24 | 1 | -8/+17 |
* | | Fix typos in the documentation | Ralf Wildenhues | 2011-01-04 | 1 | -2/+2 |
* | | Merge branch 'nd/setup' | Junio C Hamano | 2010-12-28 | 1 | -15/+8 |
|\ \ | |||||
| * | | Revert "Documentation: always respect core.worktree if set" | Nguyễn Thái Ngọc Duy | 2010-12-22 | 1 | -15/+8 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-12-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix typo in git-gc document. | Jiang Xin | 2010-12-17 | 1 | -1/+1 |
* | | | | Merge branch 'jl/fetch-submodule-recursive' | Junio C Hamano | 2010-12-16 | 1 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | Submodules: Add the "fetchRecurseSubmodules" config option | Jens Lehmann | 2010-11-12 | 1 | -0/+7 |
| * | | | | Add the 'fetch.recurseSubmodules' config setting | Jens Lehmann | 2010-11-12 | 1 | -0/+5 |
* | | | | | Merge branch 'aa/status-hilite-branch' | Junio C Hamano | 2010-12-16 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | status: show branchname with a configurable color | Aleksi Aalto | 2010-11-29 | 1 | -1/+2 |