Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'jk/stash-options' into maint | Junio C Hamano | 2015-06-16 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | stash: complain about unknown flags | Jeff King | 2015-05-20 | 1 | -0/+4 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'jk/skip-http-tests-under-no-curl' into maint | Junio C Hamano | 2015-06-05 | 7 | -35/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | tests: skip dav http-push tests under NO_EXPAT=NoThanksjk/skip-http-tests-under-no-curl | Junio C Hamano | 2015-05-07 | 1 | -0/+6 | |
| * | | | | | | | | | t/lib-httpd.sh: skip tests if NO_CURL is defined | Jeff King | 2015-05-07 | 7 | -35/+6 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'pt/pull-log-n' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | pull: handle --log=<n>pt/pull-log-n | Paul Tan | 2015-05-18 | 1 | -0/+17 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | pull: make pull.ff=true override merge.ff | Paul Tan | 2015-05-18 | 1 | -0/+8 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'mh/write-refs-sooner-2.4' into maint | Junio C Hamano | 2015-06-05 | 2 | -2/+30 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustion | Michael Haggerty | 2015-05-12 | 1 | -2/+2 | |
| * | | | | | | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE | Stefan Beller | 2015-05-12 | 1 | -2/+2 | |
| * | | | | | | | | | update-ref: test handling large transactions properly | Stefan Beller | 2015-05-12 | 1 | -0/+28 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'mh/ref-directory-file' into maint | Junio C Hamano | 2015-06-05 | 2 | -7/+114 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ref_transaction_commit(): delete extra "the" from error message | Michael Haggerty | 2015-05-11 | 1 | -7/+7 | |
| * | | | | | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts | Michael Haggerty | 2015-05-11 | 1 | -4/+4 | |
| * | | | | | | | | | refs: check for D/F conflicts among refs created in a transaction | Michael Haggerty | 2015-05-11 | 1 | -1/+1 | |
| * | | | | | | | | | t1404: new tests of ref D/F conflicts within transactions | Michael Haggerty | 2015-05-11 | 1 | -0/+107 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'mg/log-decorate-HEAD' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | log: decorate HEAD with branch name under --decorate=full, too | Junio C Hamano | 2015-05-13 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'sb/t1020-cleanup' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | subdirectory tests: code cleanup, uncomment testsb/t1020-cleanup | Stefan Beller | 2015-05-18 | 1 | -4/+7 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jc/gitignore-precedence' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | ignore: info/exclude should trump core.excludesfilejc/gitignore-precedence | Junio C Hamano | 2015-04-22 | 1 | -0/+10 | |
* | | | | | | | | | | | Merge branch 'bc/connect-plink' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | connect: improve check for plink to reduce false positivesbc/connect-plink | brian m. carlson | 2015-04-28 | 1 | -0/+33 | |
| * | | | | | | | | | | | t5601: fix quotation error leading to skipped tests | brian m. carlson | 2015-04-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'ph/rebase-i-redo' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | rebase -i: redo tasks that die during cherry-pickph/rebase-i-redo | Phil Hord | 2015-04-29 | 1 | -0/+47 | |
* | | | | | | | | | | | | | Merge branch 'jk/add-e-kill-editor' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | add: check return value of launch_editorjk/add-e-kill-editor | Jeff King | 2015-05-12 | 1 | -0/+7 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-git | Torsten Bögershausen | 2015-05-03 | 1 | -3/+15 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+114 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | t0302: "unreadable" test needs POSIXPERMpt/credential-xdg | Junio C Hamano | 2015-03-25 | 1 | -1/+1 | |
| * | | | | | | | | | | | | t0302: test credential-store support for XDG_CONFIG_HOME | Paul Tan | 2015-03-24 | 1 | -0/+114 | |
* | | | | | | | | | | | | | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t1007: add hash-object --literally tests | Eric Sunshine | 2015-05-05 | 1 | -0/+11 | |
* | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-05-26 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | filter-branch: avoid passing commit message through sed | Jeff King | 2015-04-29 | 1 | -0/+10 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-05-26 | 1 | -7/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | stash: require a clean index to apply | Jeff King | 2015-04-22 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | t3903: avoid applying onto dirty index | Jeff King | 2015-04-22 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | t3903: stop hard-coding commit sha1s | Jeff King | 2015-04-22 | 1 | -5/+5 | |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'nd/t1509-chroot-test' into maint | Junio C Hamano | 2015-05-13 | 1 | -9/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t1509: update prepare script to be able to run t1509 in chroot againnd/t1509-chroot-test | Nguyễn Thái Ngọc Duy | 2015-04-18 | 1 | -9/+29 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/type-from-string-gently' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | type_from_string_gently: make sure length matchesjk/type-from-string-gently | Jeff King | 2015-04-17 | 1 | -0/+8 | |
* | | | | | | | | | | | | | | Merge branch 'ep/fix-test-lib-functions-report' into maint | Junio C Hamano | 2015-05-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | test-lib-functions.sh: fix the second argument to some helper functionsep/fix-test-lib-functions-report | Elia Pinto | 2015-04-16 | 1 | -2/+2 |