summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.6.2v1.7.6.2Junio C Hamano2011-09-064-4/+13
* Revert "Merge branch 'cb/maint-quiet-push' into maint"Junio C Hamano2011-09-066-39/+10
* Documentation: clarify effects of -- <path> argumentsThomas Rast2011-08-301-4/+7
* whitespace: have SP on both sides of an assignment "="Junio C Hamano2011-08-254-4/+4
* update-ref: whitespace fixPang Yan Han2011-08-251-1/+1
* Git 1.7.6.1v1.7.6.1Junio C Hamano2011-08-242-2/+3
* Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano2011-08-241-0/+2
|\
| * get_indexed_object can return NULL if nothing is in that slot; check for itBrian Harring2011-08-241-0/+2
* | Update draft release notes for 1.7.6.1Junio C Hamano2011-08-231-0/+11
* | Merge branch 'jc/maint-combined-diff-work-tree' into maintJunio C Hamano2011-08-231-4/+10
|\ \
| * | diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano2011-08-041-4/+10
* | | Merge branch 'cb/maint-exec-error-report' into maintJunio C Hamano2011-08-233-17/+33
|\ \ \
| * | | notice error exit from pagerClemens Buchacher2011-08-011-9/+6
| * | | error_routine: use parent's stderr if exec failsClemens Buchacher2011-07-313-8/+27
* | | | Merge branch 'cb/maint-quiet-push' into maintJunio C Hamano2011-08-236-10/+39
|\ \ \ \
| * | | | receive-pack: do not overstep command line argument arrayJunio C Hamano2011-08-081-1/+1
| * | | | propagate --quiet to send-pack/receive-packClemens Buchacher2011-07-316-9/+38
| |/ / /
* | | | Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano2011-08-231-9/+98
|\ \ \ \ | | |_|/ | |/| |
| * | | helping smart-http/stateless-rpc fetch raceJunio C Hamano2011-08-081-9/+98
* | | | Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maintJunio C Hamano2011-08-231-0/+5
|\ \ \ \
| * | | | t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not metJunio C Hamano2011-06-151-0/+5
* | | | | add technical documentation about ref iterationHeiko Voigt2011-08-221-0/+81
* | | | | Do not use C++-style commentsMichael Haggerty2011-08-221-1/+1
* | | | | fetch-pack: check for valid commit from serverNguyễn Thái Ngọc Duy2011-08-181-0/+2
* | | | | checkout-index: remove obsolete commentNguyễn Thái Ngọc Duy2011-08-171-32/+0
* | | | | Prepare for 1.7.6.1Junio C Hamano2011-08-162-1/+53
* | | | | Merge branch 'jk/tag-list-multiple-patterns' into maintJunio C Hamano2011-08-163-12/+28
|\ \ \ \ \
| * | | | | tag: accept multiple patterns for --listJeff King2011-06-203-12/+28
* | | | | | Merge branch 'jl/submodule-update-quiet' into maintJunio C Hamano2011-08-162-4/+11
|\ \ \ \ \ \
| * | | | | | submodule: update and add must honor --quiet flagJens Lehmann2011-07-282-4/+11
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jl/submodule-add-relurl-wo-upstream' into maintJunio C Hamano2011-08-163-11/+15
|\ \ \ \ \ \
| * | | | | | submodule add: clean up duplicated codeJens Lehmann2011-06-061-9/+1
| * | | | | | submodule add: allow relative repository path even when no url is setJens Lehmann2011-06-063-4/+9
| * | | | | | submodule add: test failure when url is not configured in superprojectJens Lehmann2011-06-061-0/+7
* | | | | | | Merge branch 'oa/pull-reflog' into maintJunio C Hamano2011-08-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | pull: remove extra space from reflog messageOri Avtalion2011-08-011-1/+1
* | | | | | | | Merge branch 'js/ls-tree-error' into maintJunio C Hamano2011-08-162-3/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.Jon Seymour2011-07-252-4/+2
| * | | | | | | | Add a test to check that git ls-tree sets non-zero exit code on error.Jon Seymour2011-07-241-0/+24
* | | | | | | | | Merge branch 'jk/fast-export-quote-path' into maintJunio C Hamano2011-08-162-8/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-export: quote paths in outputJeff King2011-08-052-8/+51
* | | | | | | | | | Merge branch 'jc/checkout-reflog-fix' into maintJunio C Hamano2011-08-161-2/+5
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'v1.7.6' into jc/checkout-reflog-fixJunio C Hamano2011-07-061277-27194/+94555
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge commit 'v1.7.0' into jc/checkout-reflog-fixJunio C Hamano2011-07-061295-32474/+132143
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'v1.6.0' into jc/checkout-reflog-fixJunio C Hamano2011-07-06926-20440/+66638
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | checkout: do not write bogus reflog entry outJunio C Hamano2011-07-061-3/+5
* | | | | | | | | | | | | Merge branch 'jc/maint-reset-unmerged-path' into maintJunio C Hamano2011-08-163-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano2011-07-133-2/+18
* | | | | | | | | | | | | | Merge branch 'mz/doc-rebase-abort' into maintJunio C Hamano2011-08-162-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase: clarify "restore the original branch"Martin von Zweigbergk2011-07-132-7/+11
| |/ / / / / / / / / / / / /