Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge branch 'jl/submodule-update-quiet' into maint | Junio C Hamano | 2011-08-16 | 2 | -4/+11 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint | Junio C Hamano | 2011-08-16 | 3 | -11/+15 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'oa/pull-reflog' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/ls-tree-error' into maint | Junio C Hamano | 2011-08-16 | 2 | -3/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fast-export-quote-path' into maint | Junio C Hamano | 2011-08-16 | 2 | -8/+51 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/checkout-reflog-fix' into maint | Junio C Hamano | 2011-08-16 | 1 | -2/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-reset-unmerged-path' into maint | Junio C Hamano | 2011-08-16 | 3 | -2/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mz/doc-rebase-abort' into maint | Junio C Hamano | 2011-08-16 | 2 | -7/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/log-all-ref-updates-doc' into maint | Junio C Hamano | 2011-08-16 | 2 | -3/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-add-path-stat-pwd' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ms/help-unknown' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mz/doc-synopsis-verse' into maint | Junio C Hamano | 2011-08-16 | 93 | -6/+92 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/mime-type-with-params' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/submodule-sync-no-auto-vivify' into maint | Junio C Hamano | 2011-08-16 | 3 | -30/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/zlib-wrap' into maint | Junio C Hamano | 2011-08-16 | 15 | -124/+321 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fk/relink-upon-ldflags-update' into maint | Junio C Hamano | 2011-08-16 | 2 | -8/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maint | Junio C Hamano | 2011-08-16 | 2 | -1/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'aw/rebase-i-p' into maint | Junio C Hamano | 2011-08-16 | 4 | -5/+30 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-index-quick-exit-early' into maint | Junio C Hamano | 2011-08-16 | 3 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/combine-diff-binary-etc' into maint | Junio C Hamano | 2011-08-16 | 5 | -83/+376 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: refresh the index at start and --resolved | Jeff King | 2011-08-16 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.7 | Junio C Hamano | 2011-08-11 | 1 | -3/+36 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/partial-commit-relative-pathspec' | Junio C Hamano | 2011-08-11 | 4 | -38/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: allow partial commits with relative paths | Clemens Buchacher | 2011-08-02 | 4 | -38/+39 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fast-export-quote-path' | Junio C Hamano | 2011-08-11 | 2 | -8/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast-export: quote paths in output | Jeff King | 2011-08-05 | 2 | -8/+51 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rc/maint-http-wrong-free' | Junio C Hamano | 2011-08-11 | 2 | -9/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: some changes for http-related flag documentation | Tay Ray Chuan | 2011-08-03 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http.c: fix an invalid free() | Tay Ray Chuan | 2011-08-03 | 1 | -6/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/grep-function-context' | Junio C Hamano | 2011-08-11 | 5 | -23/+67 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: long context options | René Scharfe | 2011-08-01 | 2 | -13/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: add option to show whole function as context | René Scharfe | 2011-08-01 | 5 | -11/+47 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ef/ipv4-connect-error-report' | Junio C Hamano | 2011-08-11 | 1 | -13/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connect: only log if all attempts failed (ipv4) | Erik Faye-Lund | 2011-08-01 | 1 | -13/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' into ef/ipv4-connect-error-report | Junio C Hamano | 2011-08-01 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'oa/pull-reflog' | Junio C Hamano | 2011-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull: remove extra space from reflog message | Ori Avtalion | 2011-08-01 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ms/reflog-show-is-default' | Junio C Hamano | 2011-08-08 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog: actually default to subcommand 'show' | Michael Schubert | 2011-08-01 | 1 | -2/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-status-summary-doc' | Junio C Hamano | 2011-08-08 | 1 | -12/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/submodule: add command references and update options | Jens Lehmann | 2011-08-01 | 1 | -12/+26 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-config-list-case' | Junio C Hamano | 2011-08-08 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Git config keys are case insensitive, make config search too | Jakub Narebski | 2011-07-31 | 1 | -0/+7 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-update-quiet' | Junio C Hamano | 2011-08-08 | 2 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: update and add must honor --quiet flag | Jens Lehmann | 2011-07-28 | 2 | -4/+11 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/ls-tree-error' | Junio C Hamano | 2011-08-08 | 2 | -3/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. | Jon Seymour | 2011-07-25 | 2 | -4/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test to check that git ls-tree sets non-zero exit code on error. | Jon Seymour | 2011-07-24 | 1 | -0/+24 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-system-config' | Junio C Hamano | 2011-08-08 | 4 | -7/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Introduce common system-wide settings for convenience | Jakub Narebski | 2011-07-24 | 4 | -7/+53 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |