Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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-13 | 1 | -2/+2 |
| * | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE | Stefan Beller | 2015-05-13 | 1 | -2/+2 |
| * | update-ref: test handling large transactions properly | Stefan Beller | 2015-05-13 | 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 test | Stefan Beller | 2015-05-19 | 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.excludesfile | 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 positives | brian m. carlson | 2015-04-29 | 1 | -0/+33 |
| * | | | | | t5601: fix quotation error leading to skipped tests | brian m. carlson | 2015-04-29 | 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-pick | 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_editor | Jeff King | 2015-05-13 | 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 repo | 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 POSIXPERM | 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 again | Nguyễn Thái Ngọc Duy | 2015-04-19 | 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 matches | 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 functions | Elia Pinto | 2015-04-16 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge branch 'cn/bom-in-gitignore' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | dir: allow a BOM at the beginning of exclude files | Carlos Martín Nieto | 2015-04-16 | 1 | -0/+9 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Sync with 2.3.8 | Junio C Hamano | 2015-05-11 | 2 | -4/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | log -L: improve error message on malformed argument | Matthieu Moy | 2015-04-20 | 1 | -4/+4 |
| * | | | | | | | | | | | | Merge branch 'jc/diff-no-index-d-f' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -0/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | diff-no-index: align D/F handling with that of normal Git | Junio C Hamano | 2015-03-26 | 1 | -0/+12 |
| | * | | | | | | | | | | | diff-no-index: DWIM "diff D F" into "diff D/F F" | Junio C Hamano | 2015-03-26 | 1 | -0/+22 |
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maint | Junio C Hamano | 2015-04-27 | 2 | -16/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ |