summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'jk/add-e-kill-editor'Junio C Hamano2015-05-222-1/+9
|\ \ \ \ \ \ \
| * | | | | | | add: check return value of launch_editorjk/add-e-kill-editorJeff King2015-05-122-1/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sg/completion-config'Junio C Hamano2015-05-222-24/+48
|\ \ \ \ \ \ \
| * | | | | | | completion: simplify query for config variablessg/completion-configSZEDER Gábor2015-05-122-7/+15
| * | | | | | | completion: add a helper function to get config variablesSZEDER Gábor2015-05-122-20/+36
* | | | | | | | Merge branch 'mh/ref-directory-file'Junio C Hamano2015-05-223-118/+312
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/write-refs-sooner-2.4'Junio C Hamano2015-05-223-33/+112
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/write-refs-sooner-2.3' into mh/write-refs-sooner-2.4mh/write-refs-sooner-2.4Junio C Hamano2015-05-120-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'mh/write-refs-sooner-2.2' into mh/write-refs-sooner-2.3mh/write-refs-sooner-2.3Junio C Hamano2015-05-123-28/+103
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustionmh/write-refs-sooner-2.2Michael Haggerty2015-05-122-12/+47
| | | * | | | | | | | ref_transaction_commit(): remove the local flags variableMichael Haggerty2015-05-121-4/+3
| | | * | | | | | | | ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty2015-05-121-28/+10
| | | * | | | | | | | rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty2015-05-121-4/+8
| | | * | | | | | | | commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-121-16/+29
| | | * | | | | | | | write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-121-12/+26
| | | * | | | | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-121-2/+2
| | | * | | | | | | | update-ref: test handling large transactions properlyStefan Beller2015-05-101-0/+28
| | | | |_|_|_|_|/ / | | | |/| | | | | |
| * | | | | | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-122-23/+55
| * | | | | | | | | ref_transaction_commit(): remove the local flags variableMichael Haggerty2015-05-121-9/+9
| * | | | | | | | | ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty2015-05-121-18/+7
| * | | | | | | | | rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty2015-05-121-4/+8
| * | | | | | | | | commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-121-7/+20
| * | | | | | | | | write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-121-4/+17
| * | | | | | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-121-2/+2
| * | | | | | | | | update-ref: test handling large transactions properlyStefan Beller2015-05-121-0/+28
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mg/log-decorate-HEAD'Junio C Hamano2015-05-222-11/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log: do not shorten decoration names too earlymg/log-decorate-HEADJunio C Hamano2015-05-131-18/+16
| * | | | | | | | | log: decorate HEAD with branch name under --decorate=full, tooJunio C Hamano2015-05-132-6/+19
* | | | | | | | | | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-2219-102/+107
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: convert AsciiDoc {?foo} to ifdef::foo[]jk/asciidoc-markup-fixJeff King2015-05-141-2/+6
| * | | | | | | | | | doc: put example URLs and emails inside literal backticksJeff King2015-05-123-5/+5
| * | | | | | | | | | doc: drop backslash quoting of some curly bracesJeff King2015-05-121-7/+7
View Lorry Controller Status