{"shas":[["41a4ff29f8c965b203461d2b5ac5fe5284a307b6","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'en/merge-recursive' into pu\n\n* en/merge-recursive: (50 commits)\n  fixup! Do not assume that qsort is stable\n  t3030: fix accidental success in symlink rename\n  merge-recursive: Fix working copy handling for rename/rename/add/add\n  merge-recursive: add handling for rename/rename/add-dest/add-dest\n  merge-recursive: Have conflict_rename_delete reuse modify/delete code\n  merge-recursive: Make modify/delete handling code reusable\n  merge-recursive: Consider modifications in rename/rename(2to1) conflicts\n  merge-recursive: Create function for merging with branchname:file markers\n  merge-recursive: Record more data needed for merging with dual renames\n  merge-recursive: Defer rename/rename(2to1) handling until process_entry\n  merge-recursive: Small cleanups for conflict_rename_rename_1to2\n  merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base\n  merge-recursive: Introduce a merge_file convenience function\n  merge-recursive: Fix modify/delete resolution in the recursive case\n  merge-recursive: Provide more info in conflict markers with file renames\n  merge-recursive: Cleanup and consolidation of rename_conflict_info\n  merge-recursive: Consolidate process_entry() and process_df_entry()\n  merge-recursive: Improve handling of rename target vs. directory addition\n  merge-recursive: Add comments about handling rename/add-source cases\n  merge-recursive: Make dead code for rename/rename(2to1) conflicts undead\n  ...","Junio C Hamano"],["2a16b7da126b5d22fed339a44e62516c462792d4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'nk/branch-v-abbrev' into pu\n\n* nk/branch-v-abbrev:\n  branch -v: honor core.abbrev","Junio C Hamano"],["8ec34d983bc21b34b09dc38b3ece7677b832711d","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jm/mergetool-pathspec' into pu\n\n* jm/mergetool-pathspec:\n  mergetool: Don't assume paths are unmerged\n  mergetool: Add tests for filename with whitespace","Junio C Hamano"],["ea40c7d551d60b5964e957b00b854d879faea770","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/generation-numbers' into pu\n\n* jk/generation-numbers:\n  limit \"contains\" traversals based on commit generation\n  check commit generation cache validity against grafts\n  pretty: support %G to show the generation number of a commit\n  commit: add commit_generation function\n  add metadata-cache infrastructure\n  decorate: allow storing values instead of pointers\n\nConflicts:\n\tcache.h\n\tcommit.c","Junio C Hamano"],["d809582c07643aa1397dbc9a6570a786fcfd975c","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'rr/revert-cherry-pick-continue' into pu\n\n* rr/revert-cherry-pick-continue:\n  revert: Introduce --continue to continue the operation\n  revert: Don't implictly stomp pending sequencer operation\n  revert: Remove sequencer state when no commits are pending\n  reset: Make reset remove the sequencer state\n  revert: Introduce --reset to remove sequencer state\n  revert: Make pick_commits functionally act on a commit list\n  revert: Save command-line options for continuing operation\n  revert: Save data for continuing after conflict resolution\n  revert: Don't create invalid replay_opts in parse_args\n  revert: Separate cmdline parsing from functional code\n  revert: Introduce struct to keep command-line options\n  revert: Eliminate global \"commit\" variable\n  revert: Propogate errors upwards from do_pick_commit\n  revert: Rename no_replay to record_origin\n  revert: Don't check lone argument in get_encoding\n  revert: Simplify and inline add_message_to_msg\n  config: Introduce functions to write non-standard file\n  advice: Introduce error_resolve_conflict","Junio C Hamano"],["64e761a79179d0c4adac856ce9def7bda8d566a5","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'di/fast-import-doc' into pu\n\n* di/fast-import-doc:\n  doc/fast-import: document feature import-marks-if-exists\n  doc/fast-import: clarify notemodify command","Junio C Hamano"],["af62d745d0aa596a76169ca5db5a728eaa687e14","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/diff-index-refactor' into pu\n\n* jc/diff-index-refactor:\n  diff-lib: refactor run_diff_index() and do_diff_cache()\n  diff-lib: simplify do_diff_cache()","Junio C Hamano"],["5d89c7b3eea41da816def1c5daf6b2a06f34bcff","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jh/receive-count-limit' into pu\n\n* jh/receive-count-limit:\n  receive-pack: Allow server to refuse pushes with too many objects\n  pack-objects: Estimate pack size; abort early if pack size limit is exceeded\n  send-pack/receive-pack: Allow server to refuse pushing too large packs\n  pack-objects: Allow --max-pack-size to be used together with --stdout\n  send-pack/receive-pack: Allow server to refuse pushes with too many commits\n  pack-objects: Teach new option --max-commit-count, limiting #commits in pack\n  receive-pack: Prepare for addition of the new 'limit-*' family of capabilities\n  Tighten rules for matching server capabilities in server_supports()\n  send-pack: Attempt to retrieve remote status even if pack-objects fails\n  Update technical docs to reflect side-band-64k capability in receive-pack","Junio C Hamano"],["bacd2d752b90954ec19155d9eb4f1a053bde9bb7","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'sr/transport-helper-fix-rfc' into pu\n\n* sr/transport-helper-fix-rfc:\n  t5800: point out that deleting branches does not work\n  t5800: document inability to push new branch with old content","Junio C Hamano"],["15fd6dd445f6cbc1f26f4b765f1d99923af070d4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/http-auth-keyring' into pu\n\n* jk/http-auth-keyring:\n  credentials: add \"getpass\" helper\n  credentials: add \"store\" helper\n  credentials: add \"cache\" helper\n  docs: end-user documentation for the credential subsystem\n  http: use hostname in credential description\n  allow the user to configure credential helpers\n  look for credentials in config before prompting\n  http: use credential API to get passwords\n  fixup! introduce credentials API\n  introduce credentials API\n  http: retry authentication failures for all http requests\n  remote-curl: don't retry auth failures with dumb protocol\n  improve httpd auth tests\n  url: decode buffers that are not NUL-terminated\n\nConflicts:\n\tDocumentation/Makefile","Junio C Hamano"],["5c9882f50896e5f423e9c511b1886754cbb72df3","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'js/ls-tree-error' into pu\n\n* js/ls-tree-error:\n  Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.\n  Add a test to check that git ls-tree sets non-zero exit code on error.","Junio C Hamano"],["78a192a6fc7287b6b501f0ab3dd5dea9e8e872aa","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/gitweb-system-config' into pu\n\n* jn/gitweb-system-config:\n  gitweb: Introduce common system-wide settings for convenience","Junio C Hamano"],["d5734d8a99c4b0f302850e3c75e78c9dcd0815c4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/reset-reflog-message-fix' into pu\n\n* jk/reset-reflog-message-fix:\n  reset: give better reflog messages","Junio C Hamano"],["aa47e3c4501581d7ce3c837a0d54ffc23e68d0ec","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/merge-reword' into pu\n\n* jc/merge-reword:\n  merge: mark the final \"Merge made by...\" message for l10n\n  merge: reword the final message","Junio C Hamano"],["3893205659a9af8bb4e55986c261af0e58936859","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mh/check-attr-listing' into pu\n\n* mh/check-attr-listing:\n  Rename struct git_attr_check to git_attr_value\n  git-check-attr: Fix command-line handling to match docs\n  git-check-attr: Drive two tests using the same raw data\n  git-check-attr: Add an --all option to show all attributes\n  git-check-attr: Error out if no pathnames are specified\n  git-check-attr: Process command-line args more systematically\n  git-check-attr: Handle each error separately\n  git-check-attr: Extract a function error_with_usage()\n  git-check-attr: Introduce a new variable\n  git-check-attr: Extract a function output_attr()\n  Allow querying all attributes on a file\n  git-check-attr: Use git_attr_name()\n  Provide access to the name attribute of git_attr\n  git-check-attr: Add tests of command-line parsing\n  git-check-attr: Add missing \"&&\"\n  Disallow the empty string as an attribute name\n  Remove anachronism from comment\n  doc: Correct git_attr() calls in example code\n  doc: Add a link from gitattributes(5) to git-check-attr(1)","Junio C Hamano"],["6191528a76b8902f329d5de2adfcc00c00953386","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/add-i-hunk-filter' into pu\n\n* jk/add-i-hunk-filter:\n  add--interactive: add option to autosplit hunks\n  add--interactive: allow negatation of hunk filters\n  add--interactive: allow hunk filtering on command line\n  add--interactive: factor out regex error handling\n  add--interactive: refactor patch mode argument processing","Junio C Hamano"],["c30937fd3b429cc6dea013b2f3eb88bb9f5031cd","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jl/submodule-update-quiet' into pu\n\n* jl/submodule-update-quiet:\n  submodule: update and add must honor --quiet flag","Junio C Hamano"],["822c3d938e784f5b65cd274f82a4a3ec46165f84","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'cb/maint-exec-error-report' into pu\n\n* cb/maint-exec-error-report:\n  error_routine: use parent's stderr if exec fails","Junio C Hamano"],["9d7b6a40f06818be51729711503c60eb830bd1e7","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/gitweb-config-list-case' into pu\n\n* jn/gitweb-config-list-case:\n  gitweb: Git config keys are case insensitive, make config search too","Junio C Hamano"],["e2949503643ac1067445f5b89c95906af6973e89","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'cb/maint-quiet-push' into pu\n\n* cb/maint-quiet-push:\n  propagate --quiet to send-pack/receive-pack\n\nConflicts:\n\tDocumentation/git-receive-pack.txt\n\tDocumentation/git-send-pack.txt","Junio C Hamano"]],"ref":"refs/heads/pu","size":20,"head":"e2949503643ac1067445f5b89c95906af6973e89","push_id":38170212}