Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-combined-diff-work-tree' into maint | Junio C Hamano | 2011-08-23 | 1 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" | Junio C Hamano | 2011-08-04 | 1 | -4/+10 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/maint-exec-error-report' into maint | Junio C Hamano | 2011-08-23 | 3 | -17/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | notice error exit from pager | Clemens Buchacher | 2011-08-01 | 1 | -9/+6 | |
| * | | | | | | | | | | | | | | | | | | | | error_routine: use parent's stderr if exec fails | Clemens Buchacher | 2011-07-31 | 3 | -8/+27 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/maint-quiet-push' into maint | Junio C Hamano | 2011-08-23 | 6 | -10/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | receive-pack: do not overstep command line argument array | Junio C Hamano | 2011-08-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | propagate --quiet to send-pack/receive-pack | Clemens Buchacher | 2011-07-31 | 6 | -9/+38 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-smart-http-race-upload-pack' into maint | Junio C Hamano | 2011-08-23 | 1 | -9/+98 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | helping smart-http/stateless-rpc fetch race | Junio C Hamano | 2011-08-08 | 1 | -9/+98 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint | Junio C Hamano | 2011-08-23 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met | Junio C Hamano | 2011-06-15 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | add technical documentation about ref iteration | Heiko Voigt | 2011-08-22 | 1 | -0/+81 | |
* | | | | | | | | | | | | | | | | | | | | | | Do not use C++-style comments | Michael Haggerty | 2011-08-22 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | fetch-pack: check for valid commit from server | Nguyễn Thái Ngọc Duy | 2011-08-18 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | | | | checkout-index: remove obsolete comment | Nguyễn Thái Ngọc Duy | 2011-08-17 | 1 | -32/+0 | |
* | | | | | | | | | | | | | | | | | | | | | Prepare for 1.7.6.1 | Junio C Hamano | 2011-08-16 | 2 | -1/+53 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tag-list-multiple-patterns' into maint | Junio C Hamano | 2011-08-16 | 3 | -12/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | tag: accept multiple patterns for --list | Jeff King | 2011-06-20 | 3 | -12/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-update-quiet' into maint | Junio C Hamano | 2011-08-16 | 2 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | submodule: update and add must honor --quiet flag | Jens Lehmann | 2011-07-28 | 2 | -4/+11 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint | Junio C Hamano | 2011-08-16 | 3 | -11/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | submodule add: clean up duplicated code | Jens Lehmann | 2011-06-06 | 1 | -9/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | submodule add: allow relative repository path even when no url is set | Jens Lehmann | 2011-06-06 | 3 | -4/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | submodule add: test failure when url is not configured in superproject | Jens Lehmann | 2011-06-06 | 1 | -0/+7 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'oa/pull-reflog' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | pull: remove extra space from reflog message | Ori Avtalion | 2011-08-01 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/ls-tree-error' into maint | Junio C Hamano | 2011-08-16 | 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 'jk/fast-export-quote-path' into maint | Junio C Hamano | 2011-08-16 | 2 | -8/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | fast-export: quote paths in output | Jeff King | 2011-08-05 | 2 | -8/+51 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/checkout-reflog-fix' into maint | Junio C Hamano | 2011-08-16 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'v1.7.6' into jc/checkout-reflog-fix | Junio C Hamano | 2011-07-06 | 1277 | -27194/+94555 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge commit 'v1.7.0' into jc/checkout-reflog-fix | Junio C Hamano | 2011-07-06 | 1295 | -32474/+132143 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge commit 'v1.6.0' into jc/checkout-reflog-fix | Junio C Hamano | 2011-07-06 | 926 | -20440/+66638 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | checkout: do not write bogus reflog entry out | Junio C Hamano | 2011-07-06 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-reset-unmerged-path' into maint | Junio C Hamano | 2011-08-16 | 3 | -2/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | reset [<commit>] paths...: do not mishandle unmerged paths | Junio C Hamano | 2011-07-13 | 3 | -2/+18 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mz/doc-rebase-abort' into maint | Junio C Hamano | 2011-08-16 | 2 | -7/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | rebase: clarify "restore the original branch" | Martin von Zweigbergk | 2011-07-13 | 2 | -7/+11 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/log-all-ref-updates-doc' into maint | Junio C Hamano | 2011-08-16 | 2 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Documentation: clearly specify what refs are honored by core.logAllRefUpdates | Bert Wesarg | 2011-07-12 | 2 | -3/+6 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-add-path-stat-pwd' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | get_pwd_cwd(): Do not trust st_dev/st_ino blindly | Johannes Schindelin | 2011-07-11 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ms/help-unknown' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | help_unknown_cmd: do not propose an "unknown" cmd | Michael Schubert | 2011-07-08 | 1 | -0/+12 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mz/doc-synopsis-verse' into maint | Junio C Hamano | 2011-08-16 | 93 | -6/+92 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: use [verse] for SYNOPSIS sections | Martin von Zweigbergk | 2011-07-06 | 93 | -6/+92 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/mime-type-with-params' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |