Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/http-backend-deadlock' into maint | Junio C Hamano | 2015-06-16 |
|\ | |||
| * | Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlock | Junio C Hamano | 2015-05-25 |
| |\ | |||
| | * | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3 | Junio C Hamano | 2015-05-25 |
| | |\ | |||
| | | * | http-backend: spool ref negotiation requests to buffer | Jeff King | 2015-05-25 |
| | | * | t5551: factor out tag creation | Jeff King | 2015-05-20 |
* | | | | Merge branch 'jh/filter-empty-contents' into maint | Junio C Hamano | 2015-06-16 |
|\ \ \ \ | |||
| * | | | | sha1_file: pass empty buffer to index empty file | Jim Hill | 2015-05-18 |
* | | | | | Merge branch 'jk/stash-options' into maint | Junio C Hamano | 2015-06-16 |
|\ \ \ \ \ | |||
| * | | | | | stash: complain about unknown flags | Jeff King | 2015-05-20 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'jk/skip-http-tests-under-no-curl' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ | |||
| * | | | | | tests: skip dav http-push tests under NO_EXPAT=NoThanks | Junio C Hamano | 2015-05-07 |
| * | | | | | t/lib-httpd.sh: skip tests if NO_CURL is defined | Jeff King | 2015-05-07 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'pt/pull-log-n' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ | |||
| * | | | | | pull: handle --log=<n> | Paul Tan | 2015-05-18 |
* | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | pull: make pull.ff=true override merge.ff | Paul Tan | 2015-05-18 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'mh/write-refs-sooner-2.4' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustion | Michael Haggerty | 2015-05-12 |
| * | | | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE | Stefan Beller | 2015-05-12 |
| * | | | | | | update-ref: test handling large transactions properly | Stefan Beller | 2015-05-12 |
| |/ / / / / | |||
* | | | | | | Merge branch 'mh/ref-directory-file' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | ref_transaction_commit(): delete extra "the" from error message | Michael Haggerty | 2015-05-11 |
| * | | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts | Michael Haggerty | 2015-05-11 |
| * | | | | | | refs: check for D/F conflicts among refs created in a transaction | Michael Haggerty | 2015-05-11 |
| * | | | | | | t1404: new tests of ref D/F conflicts within transactions | Michael Haggerty | 2015-05-11 |
| |/ / / / / | |||
* | | | | | | Merge branch 'mg/log-decorate-HEAD' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | log: decorate HEAD with branch name under --decorate=full, too | Junio C Hamano | 2015-05-13 |
* | | | | | | | Merge branch 'sb/t1020-cleanup' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | subdirectory tests: code cleanup, uncomment test | Stefan Beller | 2015-05-18 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jc/gitignore-precedence' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | ignore: info/exclude should trump core.excludesfile | Junio C Hamano | 2015-04-22 |
* | | | | | | | | Merge branch 'bc/connect-plink' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | connect: improve check for plink to reduce false positives | brian m. carlson | 2015-04-28 |
| * | | | | | | | | t5601: fix quotation error leading to skipped tests | brian m. carlson | 2015-04-28 |
* | | | | | | | | | Merge branch 'ph/rebase-i-redo' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | rebase -i: redo tasks that die during cherry-pick | Phil Hord | 2015-04-29 |
* | | | | | | | | | | Merge branch 'jk/add-e-kill-editor' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | add: check return value of launch_editor | Jeff King | 2015-05-12 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | blame: CRLF in the working tree and LF in the repo | Torsten Bögershausen | 2015-05-03 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t0302: "unreadable" test needs POSIXPERM | Junio C Hamano | 2015-03-25 |
| * | | | | | | | | | | t0302: test credential-store support for XDG_CONFIG_HOME | Paul Tan | 2015-03-24 |
* | | | | | | | | | | | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t1007: add hash-object --literally tests | Eric Sunshine | 2015-05-05 |
* | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-05-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | filter-branch: avoid passing commit message through sed | Jeff King | 2015-04-29 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-05-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | stash: require a clean index to apply | Jeff King | 2015-04-22 |
| * | | | | | | | | | | | | t3903: avoid applying onto dirty index | Jeff King | 2015-04-22 |