{"shas":[["06e4c4c488f547d090acec2779a4790e1e7c519f","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/maint-merge-rename-create' into pu\n\n* jk/maint-merge-rename-create:\n  merge: turn on rewrite detection\n  merge: handle renames with replacement content\n  t3030: fix accidental success in symlink rename","Junio C Hamano"],["465712b8d895c7a3b6d97d43a37e2238043904a7","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/tag-contains' into pu\n\n* jk/tag-contains:\n  Why is \"git tag --contains\" so slow?\n  default core.clockskew variable to one day\n  limit \"contains\" traversals based on commit timestamp\n  tag: speed up --contains calculation\n\nConflicts:\n\tcommit.h\n\tgit.c","Junio C Hamano"],["776f68af5a152af6a32bbf3e3c5d8051ad1fc6ff","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/index-pack' into pu\n\n* jc/index-pack:\n  index-pack --verify: read anomalous offsets from v2 idx file\n  write_idx_file: need_large_offset() helper function\n  index-pack: --verify\n  write_idx_file: introduce a struct to hold idx customization options\n  index-pack: group the delta-base array entries also by type","Junio C Hamano"],["498887f8ca904cf076ebb6f64e792c8933a0ba1c","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/gitweb-js' into pu\n\n* jn/gitweb-js:\n  gitweb: Make JavaScript ability to adjust timezones configurable\n  gitweb.js: Add UI for selecting common timezone to display dates\n  gitweb: JavaScript ability to adjust time based on timezone\n  gitweb: Unify the way long timestamp is displayed\n  gitweb: Refactor generating of long dates into format_timestamp_html\n  gitweb.js: Provide getElementsByClassName method (if it not exists)\n  gitweb.js: Introduce code to handle cookies from JavaScript\n  gitweb.js: Extract and improve datetime handling\n  gitweb.js: Provide default values for padding in padLeftStr and padLeft\n  gitweb.js: Update and improve comments in JavaScript files\n  gitweb: Split JavaScript for maintability, combining on build\n  Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n  git-instaweb: Simplify build dependency on gitweb","Junio C Hamano"],["3f9c094ab71f9a0f2bd0e4236ab391cefd487aa8","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/add-delete-default' into pu\n\n* jc/add-delete-default:\n  git add: notice removal of tracked paths by default\n\nConflicts:\n\tbuiltin/add.c","Junio C Hamano"],["198e6190317b21e242398f870a9d7e9ae17a05c4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/ctags-more' into pu\n\n* jn/ctags-more:\n  gitweb: Optional grouping of projects by category\n  gitweb: Modularized git_get_project_description to be more generic\n  gitweb: Split git_project_list_body in two functions","Junio C Hamano"],["34b15ac6454cc6020353169e07d9310699ed145e","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/dotdot-is-parent-directory' into pu\n\n* jc/dotdot-is-parent-directory:\n  specifying ranges: we did not mean to make \"..\" an empty set\n\nConflicts:\n\tt/t1506-rev-parse-diagnosis.sh","Junio C Hamano"],["def43f4fa17203c24144041577bcd89d285fcbac","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mg/diff-stat-count' into pu\n\n* mg/diff-stat-count:\n  diff-options.txt: describe --stat-{width,name-width,count}\n  diff: introduce --stat-count to limit the stat lines","Junio C Hamano"],["54f7c0dee2acae07d905fb92d8fa4d8282be5313","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/require-work-tree-exists' into pu\n\n* jc/require-work-tree-exists:\n  require-work-tree wants more than what its name says","Junio C Hamano"],["180977d74d907f0a590427ab181ecfd002e2f83e","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/advice-about-to-lose-commit' into pu\n\n* jc/advice-about-to-lose-commit:\n  checkout: honor advice.detachedHead when reattaching to a branch","Junio C Hamano"],["f19af6c18fc406b9f96da0db6ccab3bfb909b967","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jl/read-tree-m-dry-run' into pu\n\n* jl/read-tree-m-dry-run:\n  Teach read-tree the -n|--dry-run option","Junio C Hamano"],["65f1e288210c93bfcbe17ae22ebe8657644b67e9","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"],["140735a69f9eb7b37012d94906cff3d7d37f0dff","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'hg/add-i-qq' into pu\n\n* hg/add-i-qq:\n  add-interactive: add 'Quit' shortcut to add hunk and quit","Junio C Hamano"],["d3ae628fb3119ac69a903f35e570674e462692fc","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/streaming-filter' into pu\n\n* jc/streaming-filter:\n  streaming: filter cascading\n  streaming filter: ident filter\n  Add LF-to-CRLF streaming conversion\n  stream filter: add \"no more input\" to the filters\n  Add streaming filter API\n  convert.h: move declarations for conversion from cache.h","Junio C Hamano"],["9e160838ce7b495a43a2e2003494f6ed8dbada2b","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'da/git-prefix-everywhere' into pu\n\n* da/git-prefix-everywhere:\n  git-mergetool--lib: Make vimdiff retain the current directory\n  git: Remove handling for GIT_PREFIX\n  setup: Provide GIT_PREFIX to built-ins","Junio C Hamano"],["63fa057a48347b286ab3c4b27457df33c60721d2","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/git-handle-options-miscount' into pu\n\n* jc/git-handle-options-miscount:\n  handle_options(): do not miscount how many arguments were used","Junio C Hamano"],["b44713ca322ab7fa265b4cf5ed26f2e7b28ede05","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/combine-diff-binary-etc' into pu\n\n* jk/combine-diff-binary-etc:\n  combine-diff: respect textconv attributes\n  refactor get_textconv to not require diff_filespec\n  combine-diff: handle binary files as binary\n  combine-diff: calculate mode_differs earlier\n  combine-diff: split header printing into its own function","Junio C Hamano"]],"repo":"gitster/git","actor":"gitster","ref":"refs/heads/pu","size":17,"head":"b44713ca322ab7fa265b4cf5ed26f2e7b28ede05","actor_gravatar":"750680c9dcc7d0be3ca83464a0da49d8","push_id":32091956}