aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-05
|\
| * Merge branch 'mh/write-refs-sooner-2.3' into mh/write-refs-sooner-2.4Junio C Hamano2015-05-12
| |\
| | * Merge branch 'mh/write-refs-sooner-2.2' into mh/write-refs-sooner-2.3Junio C Hamano2015-05-12
| | |\
| | | * ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-12
| | | * ref_transaction_commit(): remove the local flags variableMichael Haggerty2015-05-12
| | | * ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty2015-05-12
| | | * rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty2015-05-12
| | | * commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-12
| | | * write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-12
| | | * t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-12
| | | * update-ref: test handling large transactions properlyStefan Beller2015-05-10
| * | | ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-12
| * | | ref_transaction_commit(): remove the local flags variableMichael Haggerty2015-05-12
| * | | ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty2015-05-12
| * | | rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty2015-05-12
| * | | commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-12
| * | | write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-12
| * | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-12
| * | | update-ref: test handling large transactions properlyStefan Beller2015-05-12
* | | | Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-05
|\ \ \ \
| * | | | reflog_expire(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-11
| * | | | ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-11
| * | | | ref_transaction_commit(): provide better error messagesMichael Haggerty2015-05-11
| * | | | rename_ref(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-11
| * | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2015-05-11
| * | | | lock_ref_sha1_basic(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-11
| * | | | verify_refname_available(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-11
| * | | | verify_refname_available(): rename functionMichael Haggerty2015-05-11
| * | | | refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2015-05-11
| * | | | ref_transaction_commit(): use a string_list for detecting duplicatesMichael Haggerty2015-05-11
| * | | | is_refname_available(): use dirname in first loopMichael Haggerty2015-05-11
| * | | | struct nonmatching_ref_data: store a refname instead of a ref_entryMichael Haggerty2015-05-11
| * | | | report_refname_conflict(): inline functionMichael Haggerty2015-05-11
| * | | | entry_matches(): inline functionMichael Haggerty2015-05-11
| * | | | is_refname_available(): convert local variable "dirname" to strbufMichael Haggerty2015-05-11
| * | | | is_refname_available(): avoid shadowing "dir" variableMichael Haggerty2015-05-11
| * | | | is_refname_available(): revamp the commentsMichael Haggerty2015-05-11
| * | | | t1404: new tests of ref D/F conflicts within transactionsMichael Haggerty2015-05-11
| |/ / /
* | | | Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-05
|\ \ \ \
| * | | | log: do not shorten decoration names too earlyJunio C Hamano2015-05-13
| * | | | log: decorate HEAD with branch name under --decorate=full, tooJunio C Hamano2015-05-13
* | | | | Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-05
|\ \ \ \ \
| * | | | | subdirectory tests: code cleanup, uncomment testStefan Beller2015-05-18
* | | | | | Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \
| * | | | | | ignore: info/exclude should trump core.excludesfileJunio C Hamano2015-04-22
* | | | | | | Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | connect: improve check for plink to reduce false positivesbrian m. carlson2015-04-28
| * | | | | | | t5601: fix quotation error leading to skipped testsbrian m. carlson2015-04-28
| * | | | | | | connect: simplify SSH connection code pathbrian m. carlson2015-04-28
* | | | | | | | Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \