summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'ps/doc-packfile-vs-pack-file'Junio C Hamano2015-05-223-9/+9
|\
| * doc: fix inconsistent spelling of "packfile"ps/doc-packfile-vs-pack-filePatrick Steinhardt2015-05-222-3/+3
| * pack-protocol.txt: fix insconsistent spelling of "packfile"Patrick Steinhardt2015-05-171-3/+3
| * git-unpack-objects.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-171-2/+2
| * git-verify-pack.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-171-1/+1
* | Merge branch 'sb/t1020-cleanup'Junio C Hamano2015-05-221-4/+7
|\ \
| * | subdirectory tests: code cleanup, uncomment testsb/t1020-cleanupStefan Beller2015-05-181-4/+7
* | | Merge branch 'lm/squelch-bg-progress'Junio C Hamano2015-05-221-1/+2
|\ \ \
| * | | progress: treat "no terminal" as being in the foregroundlm/squelch-bg-progressJeff King2015-05-191-1/+2
* | | | Merge branch 'jc/ignore-epipe-in-filter'Junio C Hamano2015-05-225-8/+32
|\ \ \ \
| * | | | filter_buffer_or_fd(): ignore EPIPEjc/ignore-epipe-in-filterJunio C Hamano2015-05-202-1/+16
| * | | | copy.c: make copy_fd() report its status silentlyJunio C Hamano2015-05-193-7/+16
| | |_|/ | |/| |
* | | | Merge branch 'mh/clone-verbosity-fix'Junio C Hamano2015-05-221-2/+2
|\ \ \ \
| * | | | clone: call transport_set_verbosity before anything else on the newly created...mh/clone-verbosity-fixMike Hommey2015-05-191-2/+2
* | | | | Merge branch 'pt/pull-tags-error-diag'Junio C Hamano2015-05-221-9/+0
|\ \ \ \ \
| * | | | | pull: remove --tags error in no merge candidates casept/pull-tags-error-diagPaul Tan2015-05-141-9/+0
* | | | | | Merge branch 'mh/lockfile-retry'Junio C Hamano2015-05-225-5/+125
|\ \ \ \ \ \
| * | | | | | lock_packed_refs(): allow retries when acquiring the packed-refs lockmh/lockfile-retryMichael Haggerty2015-05-143-1/+34
| * | | | | | lockfile: allow file locking to be retried with a timeoutMichael Haggerty2015-05-142-4/+91
* | | | | | | 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
View Lorry Controller Status