Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lockfile: wait using sleep_millisec() instead of select()js/sleep-without-select | Johannes Sixt | 2015-06-05 | 1 | -9/+1 |
* | lockfile: convert retry timeout computations to millisecond | Johannes Sixt | 2015-06-05 | 1 | -13/+8 |
* | help.c: wrap wait-only poll() invocation in sleep_millisec() | Johannes Sixt | 2015-06-05 | 3 | -1/+7 |
* | lockfile: replace random() by rand() | Johannes Sixt | 2015-06-05 | 1 | -2/+2 |
* | lock_packed_refs(): allow retries when acquiring the packed-refs lockmh/lockfile-retry | Michael Haggerty | 2015-05-14 | 3 | -1/+34 |
* | lockfile: allow file locking to be retried with a timeout | Michael Haggerty | 2015-05-14 | 2 | -4/+91 |
* | Sync with 2.4.1 | Junio C Hamano | 2015-05-13 | 2 | -1/+42 |
|\ | |||||
| * | Git 2.4.1v2.4.1 | Junio C Hamano | 2015-05-13 | 4 | -3/+44 |
| * | Merge branch 'sb/line-log-plug-pairdiff-leak' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+1 |
| |\ | |||||
| * \ | Merge branch 'sb/test-bitmap-free-at-end' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'nd/t1509-chroot-test' into maint | Junio C Hamano | 2015-05-13 | 1 | -9/+29 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/type-from-string-gently' into maint | Junio C Hamano | 2015-05-13 | 2 | -1/+10 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ep/fix-test-lib-functions-report' into maint | Junio C Hamano | 2015-05-13 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'cn/bom-in-gitignore' into maint | Junio C Hamano | 2015-05-13 | 6 | -5/+39 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/prune-mtime' into maint | Junio C Hamano | 2015-05-13 | 3 | -9/+26 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/init-core-worktree-at-root' into maint | Junio C Hamano | 2015-05-13 | 1 | -3/+15 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'maint' | Junio C Hamano | 2015-05-11 | 2 | -1/+24 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Sync with 2.3.8 | Junio C Hamano | 2015-05-11 | 12 | -25/+149 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Git 2.3.8v2.3.8 | Junio C Hamano | 2015-05-11 | 4 | -3/+26 |
| | * | | | | | | | | | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3 | Junio C Hamano | 2015-05-11 | 6 | -15/+16 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-no-index-d-f' into maint-2.3 | Junio C Hamano | 2015-05-11 | 2 | -2/+98 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/epochtime-wo-tz' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -5/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | Second batch for 2.5 cycle | Junio C Hamano | 2015-05-11 | 1 | -0/+80 |
* | | | | | | | | | | | | | | | Merge branch 'pt/xdg-config-path' | Junio C Hamano | 2015-05-11 | 8 | -53/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | path.c: remove home_config_paths()pt/xdg-config-path | Paul Tan | 2015-05-06 | 2 | -29/+0 |
| * | | | | | | | | | | | | | | | git-config: replace use of home_config_paths() | Paul Tan | 2015-05-06 | 2 | -8/+4 |
| * | | | | | | | | | | | | | | | git-commit: replace use of home_config_paths() | Paul Tan | 2015-05-06 | 1 | -5/+3 |
| * | | | | | | | | | | | | | | | credential-store.c: replace home_config_paths() with xdg_config_home() | Paul Tan | 2015-05-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | dir.c: replace home_config_paths() with xdg_config_home() | Paul Tan | 2015-05-06 | 1 | -5/+2 |
| * | | | | | | | | | | | | | | | attr.c: replace home_config_paths() with xdg_config_home() | Paul Tan | 2015-05-06 | 1 | -5/+2 |
| * | | | | | | | | | | | | | | | path.c: implement xdg_config_home() | Paul Tan | 2015-05-06 | 2 | -0/+22 |
* | | | | | | | | | | | | | | | | Merge branch 'ep/do-not-feed-a-pointer-to-array-size' | Junio C Hamano | 2015-05-11 | 1 | -1/+53 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deri...ep/do-not-feed-a-pointer-to-array-size | Elia Pinto | 2015-05-05 | 1 | -1/+53 |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/hash-object' | Junio C Hamano | 2015-05-11 | 5 | -9/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | write_sha1_file(): do not use a separate sha1[] arrayjc/hash-object | Junio C Hamano | 2015-05-05 | 1 | -4/+1 |
| * | | | | | | | | | | | | | | | | | t1007: add hash-object --literally tests | Eric Sunshine | 2015-05-05 | 1 | -0/+11 |
| * | | | | | | | | | | | | | | | | | hash-object --literally: fix buffer overrun with extra-long object type | Eric Sunshine | 2015-05-05 | 3 | -3/+23 |
| * | | | | | | | | | | | | | | | | | git-hash-object.txt: document --literally option | Eric Sunshine | 2015-05-04 | 1 | -2/+8 |
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/prefix-path-free-results' | Junio C Hamano | 2015-05-11 | 2 | -13/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | prefix_path(): unconditionally free results in the callerssb/prefix-path-free-results | Stefan Beller | 2015-05-05 | 2 | -13/+10 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'sg/completion-no-redundant-all-command-list' | Junio C Hamano | 2015-05-11 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | completion: remove redundant __git_compute_all_commands() callsg/completion-no-redundant-all-command-list | SZEDER Gábor | 2015-05-03 | 1 | -1/+0 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'sg/complete-decorate-full-not-long' | Junio C Hamano | 2015-05-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | completion: fix and update 'git log --decorate=' optionssg/complete-decorate-full-not-long | SZEDER Gábor | 2015-05-03 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' | Junio C Hamano | 2015-05-11 | 2 | -1/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | filter-branch: avoid passing commit message through sed | Jeff King | 2015-04-29 | 2 | -1/+19 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/daemon-no-ipv6-for-2.4.1' | Junio C Hamano | 2015-05-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | daemon: unbreak NO_IPV6 build regressionjc/daemon-no-ipv6-for-2.4.1 | Junio C Hamano | 2015-05-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/clean-use-error-not-fprintf-on-stderr' | Junio C Hamano | 2015-05-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |