summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SQUASH???mh/ref-directory-file-2Junio C Hamano2015-05-101-2/+2
* reflog_expire(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-101-2/+2
* ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-102-8/+8
* ref_transaction_commit(): provide better error messagesMichael Haggerty2015-05-101-4/+5
* rename_ref(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-101-4/+2
* lock_ref_sha1_basic(): improve diagnostics for D/F conflictsMichael Haggerty2015-05-102-8/+16
* lock_ref_sha1_basic(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-101-16/+28
* verify_refname_available(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-101-20/+30
* verify_refname_available(): rename functionMichael Haggerty2015-05-101-17/+20
* refs: check for D/F conflicts among refs processed in a transactionMichael Haggerty2015-05-102-68/+90
* ref_transaction_commit(): use a string_list for detecting duplicatesMichael Haggerty2015-05-101-14/+11
* is_refname_available(): use dirname in first loopMichael Haggerty2015-05-101-15/+28
* struct nonmatching_ref_data: store a refname instead of a ref_entryMichael Haggerty2015-05-101-3/+4
* report_refname_conflict(): inline functionMichael Haggerty2015-05-101-8/+2
* entry_matches(): inline functionMichael Haggerty2015-05-101-7/+2
* is_refname_available(): convert local variable "dirname" to strbufMichael Haggerty2015-05-101-7/+5
* is_refname_available(): avoid shadowing "dir" variableMichael Haggerty2015-05-101-2/+2
* is_refname_available(): explain the reason for an early exitMichael Haggerty2015-05-101-1/+13
* t1404: new tests of D/F conflicts within ref transactionsMichael Haggerty2015-05-101-0/+107
* Merge branch 'mh/write-refs-sooner-2.3' into mh/write-refs-sooner-2.4Junio C Hamano2015-05-103-33/+112
|\
| * Merge branch 'mh/write-refs-sooner' into mh/write-refs-sooner-2.3Junio C Hamano2015-05-103-28/+103
| |\
| | * ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-102-12/+47
| | * ref_transaction_commit(): remove the local flags variableMichael Haggerty2015-05-101-4/+3
| | * ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty2015-05-101-28/+10
| | * rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty2015-05-101-4/+8
| | * commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-101-16/+29
| | * write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-101-12/+26
| | * t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-101-2/+2
| | * update-ref: test handling large transactions properlyStefan Beller2015-05-101-0/+28
* | | Git 2.4v2.4.0Junio C Hamano2015-04-302-1/+6
* | | Merge branch 'mh/multimail-renewal'Junio C Hamano2015-04-282-24/+25
|\ \ \
| * | | Update git-multimail to version 1.0.2mh/multimail-renewalMichael Haggerty2015-04-282-24/+25
| |/ /
* | | Merge branch 'mg/show-notes-doc'Junio C Hamano2015-04-281-2/+2
|\ \ \
| * | | rev-list-options.txt: complete sentence about notes matchingmg/show-notes-docMichael J Gruber2015-04-171-2/+2
* | | | Merge branch 'nd/versioncmp-prereleases'Junio C Hamano2015-04-281-4/+7
|\ \ \ \
| * | | | git tag: mention versionsort.prereleaseSuffix in manpagend/versioncmp-prereleasesMichael Haggerty2015-04-231-4/+7
* | | | | Merge branch 'mg/status-v-v'Junio C Hamano2015-04-281-0/+8
|\ \ \ \ \
| * | | | | status: document the -v/--verbose optionmg/status-v-vMichael Haggerty2015-04-231-0/+8
* | | | | | Sync with 2.3.7Junio C Hamano2015-04-272-1/+23
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Git 2.3.7v2.3.7Junio C Hamano2015-04-274-3/+25
| * | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-04-273-16/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-271-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/push-cert' into maintJunio C Hamano2015-04-271-0/+23
| |\ \ \ \ \ \ \
* | | | | | | | | RelNotes: wordsmithingMichael Haggerty2015-04-231-164/+172
* | | | | | | | | RelNotes: refer to the rebase -i "todo list", not "insn sheet"Michael Haggerty2015-04-231-2/+2
* | | | | | | | | RelNotes: correct name of versionsort.prereleaseSuffixMichael Haggerty2015-04-231-2/+2
* | | | | | | | | Git 2.4.0-rc3v2.4.0-rc3Junio C Hamano2015-04-221-1/+1
* | | | | | | | | Sync with maintJunio C Hamano2015-04-212-1/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Git 2.3.6v2.3.6Junio C Hamano2015-04-214-3/+17
| * | | | | | | | Merge branch 'jk/colors' into maintJunio C Hamano2015-04-211-2/+7
| |\ \ \ \ \ \ \ \