{"shas":[["e05de91a53bedd60a2ab0629e1d58b1d7bfa1f00","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"],["0af55d63d4615319bb499dc6eb65306255a6603d","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"],["54173880d9bb11bd95411d8d5e169311e531c209","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"],["a25d293de6795d7f5053d5edb08473f9337d9903","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'rr/revert-cherry-pick-continue' into pu\n\n* rr/revert-cherry-pick-continue:\n  revert: Propagate errors upwards from do_pick_commit\n  revert: Introduce --continue to continue the operation\n  revert: Don't implicitly 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: 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"],["a76283f0ba91ea27f6d3647bd5b6adea9ec1f666","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"],["a163d2022775490ebbc6e7177e11b713415132c8","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"],["9218a2bca59dfb655103f93e326ecb7851973118","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"],["356d4593eb92feb997f56964a7f48af4e284fa01","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"],["ffdbf45e54bf8a4619046690562939d5dd4ca0a9","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mh/check-attr-listing' into pu\n\n* mh/check-attr-listing: (23 commits)\n  Rename git_checkattr() to git_check_attr()\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  Remove redundant check\n  Remove redundant call to bootstrap_attr_stack()\n  Extract a function collect_all_attrs()\n  Teach prepare_attr_stack() to figure out dirlen itself\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  ...","Junio C Hamano"],["5bfa4dad0553e5a92636e784fb987895d31d0a00","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"],["b8434f843e09bfaceb7a3c1090f2f372871320c4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'ac/describe-dirty-refresh' into pu\n\n* ac/describe-dirty-refresh:\n  fixup! describe: Refresh the index when run with --dirty\n  describe: Refresh the index when run with --dirty","Junio C Hamano"],["91482e127ea037e719c914e09fa2913e8a8a52ce","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'rc/histogram-diff' into pu\n\n* rc/histogram-diff:\n  xdiff/xhistogram: drop need for additional variable\n  xdiff/xhistogram: rely on xdl_trim_ends()\n  xdiff/xhistogram: rework handling of recursed results\n  xdiff: do away with xdl_mmfile_next()","Junio C Hamano"],["e1ddc88269bd7aba09352adff272aedf102bdea9","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'cb/maint-ls-files-error-report' into pu\n\n* cb/maint-ls-files-error-report:\n  squash! ls-files: fix pathspec display on error\n  ls-files: fix pathspec display on error","Junio C Hamano"],["bab1567f0ccd53c7db5f5dcdf7ebf06645d1c631","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mh/check-attr-relative' into pu\n\n* mh/check-attr-relative:\n  test-path-utils: Add subcommand \"prefix_path\"\n  test-path-utils: Add subcommand \"absolute_path\"\n  git-check-attr: Normalize paths\n  git-check-attr: Demonstrate problems with relative paths\n  git-check-attr: Demonstrate problems with unnormalized paths\n  git-check-attr: test that no output is written to stderr","Junio C Hamano"],["ecef0d41c73dfe5145cf2570cd4960bf842c3138","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'en/merge-recursive' into pu\n\n* en/merge-recursive: (49 commits)\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  merge-recursive: Fix deletion of untracked file in rename/delete conflicts\n  ...","Junio C Hamano"],["20a8132b3dc14c8a5df1f62901f710ad0ae216a0","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'js/bisect-no-checkout' into pu\n\n* js/bisect-no-checkout:\n  bisect: further style nitpicks\n  bisect: replace \"; then\" with \"\\n<tab>*then\"\n  bisect: cleanup whitespace errors in git-bisect.sh.\n  bisect: add documentation for --no-checkout option.\n  bisect: add tests for the --no-checkout option.\n  bisect: introduce --no-checkout support into porcelain.\n  bisect: introduce support for --no-checkout option.\n  bisect: add tests to document expected behaviour in presence of broken trees.\n  bisect: use && to connect statements that are deferred with eval.\n  bisect: move argument parsing before state modification.","Junio C Hamano"],["ff0d9ac8ee1fa7c5f6b159db2945d455334affbc","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'js/sh-style' into pu\n\n* js/sh-style:\n  filter-branch.sh: de-dent usage string\n  misc-sh: fix up whitespace in some other .sh files.","Junio C Hamano"],["62cc825d4163327f97ca8d52e862089c9b47e9b7","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'po/cygwin-backslash' into pu\n\n* po/cygwin-backslash:\n  On Cygwin support both UNIX and DOS style path-names\n  git-compat-util: add generic find_last_dir_sep that respects is_dir_sep","Junio C Hamano"],["c785774c3ec7df5fad5f6856c2bd907256ba608f","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'rt/zlib-smaller-window' into pu\n\n* rt/zlib-smaller-window:\n  test: consolidate definition of $LF\n  fixup! Tolerate zlib deflation with window\n  Tolerate zlib deflation with window size < 32Kb","Junio C Hamano"],["00308d0a36a9bffb2257616ceb811a5fe31b4ab0","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'db/am-skip-blank-at-the-beginning' into pu\n\n* db/am-skip-blank-at-the-beginning:\n  RE: [PATCH v2] am: ignore leading whitespace before patch\n  am: ignore leading whitespace before patch","Junio C Hamano"]],"ref":"refs/heads/pu","size":23,"head":"819ecd8d92a5082dc33b90c23b2611ee7904a7af","push_id":38936395}