aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'js/fsck-opt'Junio C Hamano2015-08-03
|\
| * fsck: support ignoring objects in `git fsck` via fsck.skiplistJohannes Schindelin2015-06-23
| * fsck: git receive-pack: support excluding objects from fsck'ingJohannes Schindelin2015-06-23
| * fsck: introduce `git fsck --connectivity-only`Johannes Schindelin2015-06-23
| * fsck: support demoting errors to warningsJohannes Schindelin2015-06-23
| * fsck: document the new receive.fsck.<msg-id> optionsJohannes Schindelin2015-06-23
| * fsck: allow upgrading fsck warnings to errorsJohannes Schindelin2015-06-23
| * fsck: optionally ignore specific fsck issues completelyJohannes Schindelin2015-06-23
| * fsck: disallow demoting grave fsck errors to warningsJohannes Schindelin2015-06-23
| * fsck: add a simple test for receive.fsck.<msg-id>Johannes Schindelin2015-06-23
| * fsck: make fsck_tag() warn-friendlyJohannes Schindelin2015-06-23
| * fsck: handle multiple authors in commits speciallyJohannes Schindelin2015-06-23
| * fsck: make fsck_commit() warn-friendlyJohannes Schindelin2015-06-23
| * fsck: make fsck_ident() warn-friendlyJohannes Schindelin2015-06-23
| * fsck: report the ID of the error/warningJohannes Schindelin2015-06-23
| * fsck (receive-pack): allow demoting errors to warningsJohannes Schindelin2015-06-23
| * fsck: offer a function to demote fsck errors to warningsJohannes Schindelin2015-06-23
| * fsck: provide a function to parse fsck message IDsJohannes Schindelin2015-06-22
| * fsck: introduce identifiers for fsck messagesJohannes Schindelin2015-06-22
| * fsck: introduce fsck optionsJohannes Schindelin2015-06-22
* | Merge branch 'mh/init-delete-refs-api'Junio C Hamano2015-08-03
|\ \
| * | delete_ref(): use the usual convention for old_sha1Michael Haggerty2015-06-22
| * | cmd_update_ref(): make logic more straightforwardMichael Haggerty2015-06-22
| * | update_ref(): don't read old reference value before deleteMichael Haggerty2015-06-22
| * | check_branch_commit(): make first parameter constMichael Haggerty2015-06-22
| * | refs.h: add some parameter names to function declarationsMichael Haggerty2015-06-22
| * | refs: move the remaining ref module declarations to refs.hMichael Haggerty2015-06-22
| * | initial_ref_transaction_commit(): check for ref D/F conflictsMichael Haggerty2015-06-22
| * | initial_ref_transaction_commit(): check for duplicate refsMichael Haggerty2015-06-22
| * | refs: remove some functions from the module's public interfaceMichael Haggerty2015-06-22
| * | initial_ref_transaction_commit(): function for initial ref creationMichael Haggerty2015-06-22
| * | repack_without_refs(): make function privateMichael Haggerty2015-06-22
| * | prune_refs(): use delete_refs()Michael Haggerty2015-06-22
| * | prune_remote(): use delete_refs()Michael Haggerty2015-06-22
| * | delete_refs(): bail early if the packed-refs file cannot be rewrittenMichael Haggerty2015-06-22
| * | delete_refs(): make error message more genericMichael Haggerty2015-06-22
| * | delete_refs(): new function for the refs APIMichael Haggerty2015-06-22
| * | delete_ref(): handle special case more explicitlyMichael Haggerty2015-06-22
| * | remove_branches(): remove temporaryMichael Haggerty2015-06-22
| * | delete_ref(): move declaration to refs.hMichael Haggerty2015-06-22
* | | Merge branch 'pt/pull-builtin'Junio C Hamano2015-08-03
|\ \ \
| * | | pull: remove redirection to git-pull.shPaul Tan2015-06-18
| * | | pull --rebase: error on no merge candidate casesPaul Tan2015-06-18
| * | | pull --rebase: exit early when the working directory is dirtyPaul Tan2015-06-18
| * | | pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan2015-06-18
| * | | pull: teach git pull about --rebasePaul Tan2015-06-18
| * | | pull: set reflog messagePaul Tan2015-06-18
| * | | pull: implement pulling into an unborn branchPaul Tan2015-06-18
| * | | pull: fast-forward working tree if head is updatedPaul Tan2015-06-18
| * | | pull: check if in unresolved merge statePaul Tan2015-06-18