summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* reflog_expire(): integrate lock_ref_sha1_basic() errors into oursmh/ref-directory-file-3mh/ref-directory-fileMichael Haggerty2015-05-111-2/+2
* ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-112-8/+8
* ref_transaction_commit(): provide better error messagesMichael Haggerty2015-05-111-4/+6
* rename_ref(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-111-4/+2
* lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2015-05-112-8/+16
* lock_ref_sha1_basic(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-111-16/+28
* verify_refname_available(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-111-20/+30
* verify_refname_available(): rename functionMichael Haggerty2015-05-111-17/+20
* refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2015-05-112-63/+95
* ref_transaction_commit(): use a string_list for detecting duplicatesMichael Haggerty2015-05-111-14/+11
* is_refname_available(): use dirname in first loopMichael Haggerty2015-05-111-14/+26
* struct nonmatching_ref_data: store a refname instead of a ref_entryMichael Haggerty2015-05-111-3/+4
* report_refname_conflict(): inline functionMichael Haggerty2015-05-111-8/+2
* entry_matches(): inline functionMichael Haggerty2015-05-111-7/+2
* is_refname_available(): convert local variable "dirname" to strbufMichael Haggerty2015-05-111-7/+5
* is_refname_available(): avoid shadowing "dir" variableMichael Haggerty2015-05-111-2/+2
* is_refname_available(): revamp the commentsMichael Haggerty2015-05-111-22/+47
* t1404: new tests of ref D/F conflicts within transactionsMichael Haggerty2015-05-111-0/+107
* 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/test-annoyances' into maintJunio C Hamano2015-04-215-15/+24
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano2015-04-211-8/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jz/gitweb-conf-doc-fix' into maintJunio C Hamano2015-04-211-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/cherry-pick-docfix' into maintJunio C Hamano2015-04-211-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'iu/fix-parse-options-h-comment' into maintJunio C Hamano2015-04-211-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jg/cguide-we-cannot-count' into maintJunio C Hamano2015-04-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-corruption-post-mortem' into maintJunio C Hamano2015-04-211-0/+237
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maintJunio C Hamano2015-04-211-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | RelNotes: "merge --quiet" change has been revertedJunio C Hamano2015-04-211-4/+0
* | | | | | | | | | | | | | | | | Hopefully the last batch for 2.4Junio C Hamano2015-04-201-1/+18
* | | | | | | | | | | | | | | | | Merge branch 'ps/grep-help-all-callback-arg'Junio C Hamano2015-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status