Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specs | Lars Schneider | 2015-08-28 | 2 | -0/+207 |
* | Sixth batch for 2.6 | Junio C Hamano | 2015-08-26 | 1 | -0/+17 |
* | Merge branch 'sg/help-group' | Junio C Hamano | 2015-08-26 | 3 | -52/+52 |
|\ | |||||
| * | generate-cmdlist: re-implement as shell script | Eric Sunshine | 2015-08-25 | 3 | -52/+52 |
* | | Merge branch 'sg/wt-status-header-inclusion' | Junio C Hamano | 2015-08-26 | 2 | -1/+1 |
|\ \ | |||||
| * | | wt-status: move #include "pathspec.h" to the headersg/wt-status-header-inclusion | SZEDER Gábor | 2015-08-21 | 2 | -1/+1 |
* | | | Merge branch 'as/docfix-reflog-expire-unreachable' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableas/docfix-reflog-expire-unreachable | Andreas Schwab | 2015-08-21 | 1 | -1/+1 |
* | | | | Merge branch 'sg/t3020-typofix' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | t3020: fix typo in test descriptionsg/t3020-typofix | SZEDER Gábor | 2015-08-20 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/calloc-pathspec' | Junio C Hamano | 2015-08-26 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspec | Junio C Hamano | 2015-08-20 | 2 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dt/untracked-sparse' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t7063: use --force-untracked-cache to speed up a bitdt/untracked-sparse | Nguyễn Thái Ngọc Duy | 2015-08-19 | 1 | -1/+1 |
* | | | | | | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | i18n: am: fix typo in description of -b option | Jiang Xin | 2015-08-26 | 1 | -1/+1 |
* | | | | | | | Merge branch 'pt/am-builtin-abort-fix' | Junio C Hamano | 2015-08-26 | 2 | -13/+60 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fix | Paul Tan | 2015-08-19 | 2 | -13/+60 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'po/po-readme' | Junio C Hamano | 2015-08-26 | 1 | -0/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | po/README: Update directions for l10n contributorspo/po-readme | Philip Oakley | 2015-08-17 | 1 | -0/+19 |
* | | | | | | | | Merge branch 'jv/send-email-selective-smtp-auth' | Junio C Hamano | 2015-08-26 | 2 | -1/+38 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | send-email: provide whitelist of SMTP AUTH mechanismsjv/send-email-selective-smtp-auth | Jan Viktorin | 2015-08-17 | 2 | -1/+38 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ep/http-configure-ssl-version' | Junio C Hamano | 2015-08-26 | 3 | -1/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | http: add support for specifying the SSL versionep/http-configure-ssl-version | Elia Pinto | 2015-08-17 | 3 | -1/+56 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ss/fix-config-fd-leak' | Junio C Hamano | 2015-08-26 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: close config file handle in case of errorss/fix-config-fd-leak | Sven Strickroth | 2015-08-14 | 1 | -1/+4 |
* | | | | | | | | | Sync with maint | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/guess-repo-name-regression-fix' into maint | Junio C Hamano | 2015-08-25 | 2 | -1/+108 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-with-x' into maint | Junio C Hamano | 2015-08-25 | 1 | -2/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/check-return-from-read-ref' into maint | Junio C Hamano | 2015-08-25 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/pull-upload-pack' into maint | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | pull: pass upload_pack only when it was givenmm/pull-upload-pack | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Fifth batch for 2.6 | Junio C Hamano | 2015-08-25 | 1 | -0/+33 |
* | | | | | | | | | | | | | | Merge branch 'cb/open-noatime-clear-errno' | Junio C Hamano | 2015-08-25 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | git_open_noatime: return with errno=0 on successcb/open-noatime-clear-errno | Clemens Buchacher | 2015-08-12 | 1 | -1/+4 |
* | | | | | | | | | | | | | | | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 | 18 | -630/+969 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | credential-cache--daemon: use tempfile modulemh/tempfile | Michael Haggerty | 2015-08-12 | 1 | -20/+6 |
| * | | | | | | | | | | | | | | | credential-cache--daemon: delete socket from main() | Michael Haggerty | 2015-08-12 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | gc: use tempfile module to handle gc.pid file | Michael Haggerty | 2015-08-12 | 1 | -20/+5 |
| * | | | | | | | | | | | | | | | lock_repo_for_gc(): compute the path to "gc.pid" only once | Michael Haggerty | 2015-08-12 | 1 | -3/+6 |
| * | | | | | | | | | | | | | | | diff: use tempfile module | Michael Haggerty | 2015-08-12 | 1 | -23/+23 |
| * | | | | | | | | | | | | | | | setup_temporary_shallow(): use tempfile module | Michael Haggerty | 2015-08-10 | 1 | -28/+7 |
| * | | | | | | | | | | | | | | | write_shared_index(): use tempfile module | Michael Haggerty | 2015-08-10 | 1 | -32/+6 |
| * | | | | | | | | | | | | | | | register_tempfile(): new function to handle an existing temporary file | Michael Haggerty | 2015-08-10 | 2 | -0/+16 |
| * | | | | | | | | | | | | | | | tempfile: add several functions for creating temporary files | Michael Haggerty | 2015-08-10 | 2 | -0/+149 |
| * | | | | | | | | | | | | | | | prepare_tempfile_object(): new function, extracted from create_tempfile() | Michael Haggerty | 2015-08-10 | 1 | -7/+13 |
| * | | | | | | | | | | | | | | | tempfile: a new module for handling temporary files | Michael Haggerty | 2015-08-10 | 5 | -270/+470 |
| * | | | | | | | | | | | | | | | commit_lock_file(): use get_locked_file_path() | Michael Haggerty | 2015-08-10 | 1 | -16/+12 |
| * | | | | | | | | | | | | | | | lockfile: add accessor get_lock_file_path() | Michael Haggerty | 2015-08-10 | 6 | -20/+34 |
| * | | | | | | | | | | | | | | | lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() | Michael Haggerty | 2015-08-10 | 5 | -7/+26 |