summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* delete_ref(): use the usual convention for old_sha1mh/init-delete-refs-apiMichael Haggerty2015-06-224-15/+14
* cmd_update_ref(): make logic more straightforwardMichael Haggerty2015-06-221-3/+10
* update_ref(): don't read old reference value before deleteMichael Haggerty2015-06-221-3/+3
* check_branch_commit(): make first parameter constMichael Haggerty2015-06-221-1/+1
* refs.h: add some parameter names to function declarationsMichael Haggerty2015-06-221-11/+11
* refs: move the remaining ref module declarations to refs.hMichael Haggerty2015-06-2210-91/+109
* initial_ref_transaction_commit(): check for ref D/F conflictsMichael Haggerty2015-06-221-0/+34
* initial_ref_transaction_commit(): check for duplicate refsMichael Haggerty2015-06-221-0/+11
* refs: remove some functions from the module's public interfaceMichael Haggerty2015-06-222-37/+24
* initial_ref_transaction_commit(): function for initial ref creationMichael Haggerty2015-06-223-4/+75
* repack_without_refs(): make function privateMichael Haggerty2015-06-222-12/+8
* prune_refs(): use delete_refs()Michael Haggerty2015-06-221-8/+17
* prune_remote(): use delete_refs()Michael Haggerty2015-06-221-9/+2
* delete_refs(): bail early if the packed-refs file cannot be rewrittenMichael Haggerty2015-06-221-3/+22
* delete_refs(): make error message more genericMichael Haggerty2015-06-221-1/+1
* delete_refs(): new function for the refs APIMichael Haggerty2015-06-223-20/+27
* delete_ref(): handle special case more explicitlyMichael Haggerty2015-06-221-2/+9
* remove_branches(): remove temporaryMichael Haggerty2015-06-221-2/+1
* delete_ref(): move declaration to refs.hMichael Haggerty2015-06-223-4/+13
* Second half of seventh batchJunio C Hamano2015-06-111-0/+28
* Merge branch 'tb/complete-sequencing'Junio C Hamano2015-06-111-0/+5
|\
| * completion: suggest sequencer commands for reverttb/complete-sequencingThomas Braun2015-06-011-0/+5
* | Merge branch 'jk/squelch-missing-link-warning-for-unreachable'Junio C Hamano2015-06-117-9/+34
|\ \
| * | suppress errors on missing UNINTERESTING linksjk/squelch-missing-link-warning-for-unreachableJeff King2015-06-011-1/+1
| * | silence broken link warnings with revs->ignore_missing_linksJeff King2015-06-013-2/+17
| * | add quieter versions of parse_{tree,commit}Jeff King2015-06-014-6/+16
* | | Merge branch 'pt/pull-tests'Junio C Hamano2015-06-112-36/+175
|\ \ \
| * | | t5520: check reflog action in fast-forward mergept/pull-testsPaul Tan2015-05-291-3/+10
| * | | t5521: test --dry-run does not make any changesPaul Tan2015-05-291-0/+13
| * | | t5520: test --rebase failure on unborn branch with indexPaul Tan2015-05-291-0/+15
| * | | t5520: test --rebase with multiple branchesPaul Tan2015-05-291-0/+9
| * | | t5520: test work tree fast-forward when fetch updates headPaul Tan2015-05-291-0/+21
| * | | t5520: test for failure if index has unresolved entriesPaul Tan2015-05-291-0/+19
| * | | t5520: test no merge candidates casesPaul Tan2015-05-181-0/+55
| * | | t5520: prevent field splitting in content comparisonsPaul Tan2015-05-181-35/+35
* | | | Merge branch 'sb/glossary-submodule'Junio C Hamano2015-06-111-0/+16
|\ \ \ \
| * | | | glossary: add "remote", "submodule", "superproject"sb/glossary-submoduleStefan Beller2015-05-291-0/+16
| | |_|/ | |/| |
* | | | Merge branch 'sb/submodule-doc-intro'Junio C Hamano2015-06-111-28/+22
|\ \ \ \
| * | | | submodule doc: reorder introductory paragraphssb/submodule-doc-introStefan Beller2015-05-281-28/+22
| |/ / /
* | | | Merge branch 'jk/diagnose-config-mmap-failure'Junio C Hamano2015-06-114-11/+29
|\ \ \ \
| * | | | xmmap(): drop "Out of memory?"jk/diagnose-config-mmap-failureJunio C Hamano2015-05-281-1/+1
| * | | | config.c: rewrite ENODEV into EISDIR when mmap failsJeff King2015-05-281-0/+2
| * | | | config.c: avoid xmmap error messagesJeff King2015-05-283-6/+21
| * | | | config.c: fix mmap leak when writing configJeff King2015-05-281-4/+5
| * | | | read-cache.c: drop PROT_WRITE from mmap of indexJeff King2015-05-281-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano2015-06-111-1/+1
|\ \ \ \
| * | | | p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-versionMiguel Torroja2015-05-271-1/+1
* | | | | Merge branch 'mh/verify-lock-error-report'Junio C Hamano2015-06-112-21/+33
|\ \ \ \ \
| * | | | | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-reportMichael Haggerty2015-05-272-9/+9
| * | | | | verify_lock(): do not capitalize error messagesMichael Haggerty2015-05-271-2/+2