{"shas":[["73946a621d2b0223bdd8ed52437797fb46f777b1","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"],["befc1cf632ef67ffc350b00b3b4fba4903b5721e","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\tgit.c","Junio C Hamano"],["f17a82fd66685e25fbf122cd5b29e8c3f53cf433","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"],["64a18000338d4463bc8af9a198dad158e1abc31b","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'rr/rerere-clear-libify' into pu\n\n* rr/rerere-clear-libify:\n  rerere: Expose an API corresponding to 'clear' functionality","Junio C Hamano"],["85d00b4520d19e350557975cb8d27c616dc25c02","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"],["6192727c6f2ac2ebd27011826009a7fff0127511","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"],["36c7ab9f3c1c16bf4db81d7cf5ea7e0736460627","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"],["2d5c054a14d32349adaef1682ec6007c494dd033","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"],["b3a894a18f008d27db34a1803768b03954f5e14f","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"],["b1f82a4e377b2acb4f519000413660b9bc577b86","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mk/grep-pcre' into pu\n\n* mk/grep-pcre:\n  grep: Put calls to fixmatch() and regmatch() into patmatch()\n  contrib/completion: --line-number to git grep\n  Documentation: Add --line-number to git-grep synopsis","Junio C Hamano"],["b8cc7307d132346390c91c48cad5431ff37c87c3","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/maint-branch-mergeoptions' into pu\n\n* jc/maint-branch-mergeoptions:\n  merge: fix branch.<name>.mergeoptions\n\nConflicts:\n\tbuiltin/merge.c","Junio C Hamano"],["ff9b4b1c5385dd7fb4f1431401455c0085d392f1","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\n\nConflicts:\n\tgit-rebase--interactive.sh","Junio C Hamano"],["32feb5f80587f457f69319fe72cbcaeead52dcb4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'kk/maint-prefix-in-config-mak' into pu\n\n* kk/maint-prefix-in-config-mak:\n  config.mak.in: allow \"configure --sysconfdir=/else/where\"\n  Makefile: allow sysconfdir to be used from configure","Junio C Hamano"],["faa20014f3f1d6e18c4ef870a0c8e7cfb74ac951","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'sr/maint-fast-import-tighten-option-parsing' into pu\n\n* sr/maint-fast-import-tighten-option-parsing:\n  fast-import: fix option parser for no-arg options","Junio C Hamano"],["0c7abcb06747cf1e7629d6eb30a95d68bcc04729","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"],["2337960ee8264dcc8aeb8acae467cebaa402e124","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mg/merge-ff-config' into pu\n\n* mg/merge-ff-config:\n  merge: introduce merge.ff configuration variable","Junio C Hamano"]],"repo":"gitster/git","actor":"gitster","ref":"refs/heads/pu","size":16,"head":"2337960ee8264dcc8aeb8acae467cebaa402e124","actor_gravatar":"750680c9dcc7d0be3ca83464a0da49d8","push_id":30743541}