summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.7.2v1.7.7.2Junio C Hamano2011-11-012-1/+45
* Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-11-011-1/+1
|\
| * t7511: avoid use of reserved filename on Windows.Pat Thoyts2011-10-311-1/+1
* | Merge branch 'md/smtp-tls-hello-again' into maintJunio C Hamano2011-11-011-1/+1
|\ \
| * | send-email: Honour SMTP domain when using TLSMatthew Daley2011-10-151-1/+1
* | | Merge branch 'jk/pull-rebase-with-work-tree' into maintJunio C Hamano2011-11-012-2/+2
|\ \ \
| * | | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-132-2/+2
* | | | Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano2011-11-011-0/+2
|\ \ \ \
| * | | | diff: teach --stat/--numstat to honor -U$numJunio C Hamano2011-09-221-0/+2
* | | | | Merge branch 'js/bisect-no-checkout' into maintJunio C Hamano2011-11-011-1/+2
|\ \ \ \ \
| * | | | | bisect: fix exiting when checkout failed in bisect_start()Christian Couder2011-09-211-1/+2
* | | | | | Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-0111-36/+92
|\ \ \ \ \ \
| * | | | | | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-112-3/+61
| * | | | | | attr: read core.attributesfile from git_default_core_configJunio C Hamano2011-10-065-13/+9
| * | | | | | builtin/mv.c: plug miniscule memory leakBrandon Casey2011-10-061-1/+5
| * | | | | | cleanup: use internal memory allocation wrapper functions everywhereBrandon Casey2011-10-067-8/+8
| * | | | | | attr.c: avoid inappropriate access to strbuf "buf" memberBrandon Casey2011-10-061-13/+11
* | | | | | | Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-015-55/+137
|\ \ \ \ \ \ \
| * | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruningCarlos Martín Nieto2011-10-152-4/+23
| * | | | | | | fetch: honor the user-provided refspecs when pruning refsCarlos Martín Nieto2011-10-155-20/+36
| * | | | | | | remote: separate out the remote_find_tracking logic into query_refspecsCarlos Martín Nieto2011-10-151-36/+33
| * | | | | | | t5510: add tests for fetch --pruneCarlos Martín Nieto2011-10-071-0/+50
| * | | | | | | fetch: free all the additional refspecsCarlos Martín Nieto2011-10-071-1/+1
* | | | | | | | Merge branch 'sp/smart-http-failure' into maintJunio C Hamano2011-11-011-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-curl: Fix warning after HTTP failureShawn O. Pearce2011-10-041-1/+8
* | | | | | | | | Merge jn/maint-http-error-messageJunio C Hamano2011-11-011-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: avoid empty error messages for some curl errorsJonathan Nieder2011-09-061-1/+6
| * | | | | | | | | http: remove extra newline in error messageJonathan Nieder2011-09-061-1/+1
* | | | | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-10-272-3/+53
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | read-cache.c: fix index memory allocationRené Scharfe2011-10-262-3/+53
* | | | | | | | | | clone: Quote user supplied path in a single quote pairRichard Hartmann2011-10-271-2/+2
* | | | | | | | | | Merge branch 'jn/gitweb-highlite-sanitise' into maintJunio C Hamano2011-10-261-1/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: Strip non-printable characters from syntax highlighter outputJakub Narebski2011-09-161-1/+13
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-2611-107/+261
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | run_hook: use argv_array APIJeff King2011-09-141-10/+8
| * | | | | | | | | | checkout: use argv_array APIJeff King2011-09-141-19/+8
| * | | | | | | | | | bisect: use argv_array APIJeff King2011-09-141-37/+11
| * | | | | | | | | | quote: provide sq_dequote_to_argv_arrayJeff King2011-09-142-3/+28
| * | | | | | | | | | refactor argv_array into generic codeJeff King2011-09-145-35/+125
| * | | | | | | | | | quote.h: fix bogus commentJeff King2011-09-141-3/+2
| * | | | | | | | | | add sha1_array API docsJeff King2011-09-141-0/+79
* | | | | | | | | | | Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-261-19/+52
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refactor run_receive_hook()Junio C Hamano2011-09-121-19/+52
* | | | | | | | | | | | Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano2011-10-264-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove 'working copy' from the documentation and C codeCarlos Martín Nieto2011-09-214-6/+6
* | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-2610-93/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6Junio C Hamano2011-10-261-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty2011-09-271-1/+2
| * | | | | | | | | | | | | | Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6Junio C Hamano2011-10-261-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | gitweb: Fix links to lines in blobs when javascript-actions are enabledPeter Stuge2011-09-271-4/+4