summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4: fix P4 label import for unprocessed commitsld/p4-import-labelsLuke Diamand2015-08-282-9/+18
* git-p4: do not terminate creating tag for unknown commitLuke Diamand2015-08-281-2/+2
* git-p4: failing test for ignoring invalid p4 labelsLuke Diamand2015-08-281-0/+45
* Sixth batch for 2.6Junio C Hamano2015-08-261-0/+17
* Merge branch 'sg/help-group'Junio C Hamano2015-08-263-52/+52
|\
| * generate-cmdlist: re-implement as shell scriptEric Sunshine2015-08-253-52/+52
* | Merge branch 'sg/wt-status-header-inclusion'Junio C Hamano2015-08-262-1/+1
|\ \
| * | wt-status: move #include "pathspec.h" to the headersg/wt-status-header-inclusionSZEDER Gábor2015-08-212-1/+1
* | | Merge branch 'as/docfix-reflog-expire-unreachable'Junio C Hamano2015-08-261-1/+1
|\ \ \
| * | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableas/docfix-reflog-expire-unreachableAndreas Schwab2015-08-211-1/+1
* | | | Merge branch 'sg/t3020-typofix'Junio C Hamano2015-08-261-1/+1
|\ \ \ \
| * | | | t3020: fix typo in test descriptionsg/t3020-typofixSZEDER Gábor2015-08-201-1/+1
* | | | | Merge branch 'jc/calloc-pathspec'Junio C Hamano2015-08-262-2/+2
|\ \ \ \ \
| * | | | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspecJunio C Hamano2015-08-202-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'dt/untracked-sparse'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \
| * | | | | t7063: use --force-untracked-cache to speed up a bitdt/untracked-sparseNguyễn Thái Ngọc Duy2015-08-191-1/+1
* | | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \
| * | | | | | i18n: am: fix typo in description of -b optionJiang Xin2015-08-261-1/+1
* | | | | | | Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano2015-08-262-13/+60
|\ \ \ \ \ \ \
| * | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fixPaul Tan2015-08-192-13/+60
| |/ / / / / /
* | | | | | | Merge branch 'po/po-readme'Junio C Hamano2015-08-261-0/+19
|\ \ \ \ \ \ \
| * | | | | | | po/README: Update directions for l10n contributorspo/po-readmePhilip Oakley2015-08-171-0/+19
* | | | | | | | Merge branch 'jv/send-email-selective-smtp-auth'Junio C Hamano2015-08-262-1/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | send-email: provide whitelist of SMTP AUTH mechanismsjv/send-email-selective-smtp-authJan Viktorin2015-08-172-1/+38
| |/ / / / / / /
* | | | | | | | Merge branch 'ep/http-configure-ssl-version'Junio C Hamano2015-08-263-1/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | http: add support for specifying the SSL versionep/http-configure-ssl-versionElia Pinto2015-08-173-1/+56
| |/ / / / / / /
* | | | | | | | Merge branch 'ss/fix-config-fd-leak'Junio C Hamano2015-08-261-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | config: close config file handle in case of errorss/fix-config-fd-leakSven Strickroth2015-08-141-1/+4
* | | | | | | | | Sync with maintJunio C Hamano2015-08-251-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-252-1/+108
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-with-x' into maintJunio C Hamano2015-08-251-2/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/check-return-from-read-ref' into maintJunio C Hamano2015-08-251-2/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/pull-upload-pack' into maintJunio C Hamano2015-08-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | pull: pass upload_pack only when it was givenmm/pull-upload-packJunio C Hamano2015-08-251-1/+1
* | | | | | | | | | | | | | Fifth batch for 2.6Junio C Hamano2015-08-251-0/+33
* | | | | | | | | | | | | | Merge branch 'cb/open-noatime-clear-errno'Junio C Hamano2015-08-251-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git_open_noatime: return with errno=0 on successcb/open-noatime-clear-errnoClemens Buchacher2015-08-121-1/+4
* | | | | | | | | | | | | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-2518-630/+969
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | credential-cache--daemon: use tempfile modulemh/tempfileMichael Haggerty2015-08-121-20/+6
| * | | | | | | | | | | | | | | credential-cache--daemon: delete socket from main()Michael Haggerty2015-08-121-1/+2
| * | | | | | | | | | | | | | | gc: use tempfile module to handle gc.pid fileMichael Haggerty2015-08-121-20/+5
| * | | | | | | | | | | | | | | lock_repo_for_gc(): compute the path to "gc.pid" only onceMichael Haggerty2015-08-121-3/+6
| * | | | | | | | | | | | | | | diff: use tempfile moduleMichael Haggerty2015-08-121-23/+23
| * | | | | | | | | | | | | | | setup_temporary_shallow(): use tempfile moduleMichael Haggerty2015-08-101-28/+7
| * | | | | | | | | | | | | | | write_shared_index(): use tempfile moduleMichael Haggerty2015-08-101-32/+6
| * | | | | | | | | | | | | | | register_tempfile(): new function to handle an existing temporary fileMichael Haggerty2015-08-102-0/+16
| * | | | | | | | | | | | | | | tempfile: add several functions for creating temporary filesMichael Haggerty2015-08-102-0/+149
| * | | | | | | | | | | | | | | prepare_tempfile_object(): new function, extracted from create_tempfile()Michael Haggerty2015-08-101-7/+13
| * | | | | | | | | | | | | | | tempfile: a new module for handling temporary filesMichael Haggerty2015-08-105-270/+470
| * | | | | | | | | | | | | | | commit_lock_file(): use get_locked_file_path()Michael Haggerty2015-08-101-16/+12