summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableAndreas Schwab2015-08-211-1/+1
* | | | | | | | | | | | | Merge branch 'sg/t3020-typofix'Junio C Hamano2015-08-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t3020: fix typo in test descriptionSZEDER Gábor2015-08-201-1/+1
* | | | | | | | | | | | | | Merge branch 'jc/calloc-pathspec'Junio C Hamano2015-08-272-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ps_matched: xcalloc() takes nmemb and then element sizeJunio C Hamano2015-08-202-2/+2
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'dt/untracked-sparse'Junio C Hamano2015-08-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | t7063: use --force-untracked-cache to speed up a bitNguyễn Thái Ngọc Duy2015-08-191-1/+1
* | | | | | | | | | | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-271-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-272-13/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan2015-08-192-13/+60
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'po/po-readme'Junio C Hamano2015-08-271-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | po/README: Update directions for l10n contributorsPhilip Oakley2015-08-171-0/+19
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jv/send-email-selective-smtp-auth'Junio C Hamano2015-08-272-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | send-email: provide whitelist of SMTP AUTH mechanismsJan Viktorin2015-08-172-1/+38
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ep/http-configure-ssl-version'Junio C Hamano2015-08-273-1/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | http: add support for specifying the SSL versionElia Pinto2015-08-173-1/+56
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ss/fix-config-fd-leak'Junio C Hamano2015-08-271-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config: close config file handle in case of errorSven Strickroth2015-08-141-1/+4
* | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-262-1/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-with-x' into maintJunio C Hamano2015-08-261-2/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/check-return-from-read-ref' into maintJunio C Hamano2015-08-261-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/pull-upload-pack' into maintJunio C Hamano2015-08-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | pull: pass upload_pack only when it was givenJunio C Hamano2015-08-261-1/+1
* | | | | | | | | | | | | | | | | | | Fifth batch for 2.6Junio C Hamano2015-08-261-0/+33
* | | | | | | | | | | | | | | | | | | Merge branch 'cb/open-noatime-clear-errno'Junio C Hamano2015-08-251-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git_open_noatime: return with errno=0 on successClemens Buchacher2015-08-121-1/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-2518-630/+969
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | credential-cache--daemon: use tempfile moduleMichael 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
| * | | | | | | | | | | | | | | | | | | lockfile: add accessor get_lock_file_path()Michael Haggerty2015-08-106-20/+34
| * | | | | | | | | | | | | | | | | | | lockfile: add accessors get_lock_file_fd() and get_lock_file_fp()Michael Haggerty2015-08-105-7/+26
| * | | | | | | | | | | | | | | | | | | create_bundle(): duplicate file descriptor to avoid closing it twiceMichael Haggerty2015-08-101-10/+16
| * | | | | | | | | | | | | | | | | | | lockfile: move documentation to lockfile.h and lockfile.cMichael Haggerty2015-08-103-280/+283
* | | | | | | | | | | | | | | | | | | | Merge branch 'pt/am-builtin-options'Junio C Hamano2015-08-253-10/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am: let --signoff override --no-signoffPaul Tan2015-08-122-3/+45
| * | | | | | | | | | | | | | | | | | | am: let command-line options override saved optionsPaul Tan2015-08-122-4/+94
| * | | | | | | | | | | | | | | | | | | test_terminal: redirect child process' stdin to a ptyPaul Tan2015-08-121-4/+28
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'dt/refs-pseudo'Junio C Hamano2015-08-255-56/+163
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \