{"shas":[["7f497260a480bb3e9e6a74fa4f8115fc149a4199","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/add-u-migration' (early part) into pu\n\n* 'jc/add-u-migration' (early part):\n  add: make \"add -u/-A\" update full tree without pathspec\n\nConflicts:\n\tbuiltin/add.c","Junio C Hamano"],["c5bd488f4da88b69ae5e86d08e3a49b3d6076a38","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mz/maint-rename-unmerged' into pu\n\n* mz/maint-rename-unmerged:\n  diffcore-rename: don't consider unmerged path as source","Junio C Hamano"],["42a1aee8b1c5337fe81e72eceed97004d1614c88","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'nd/struct-pathspec' into pu\n\n* nd/struct-pathspec:\n  Improve tree_entry_interesting() handling code\n  Convert read_tree{,_recursive} to support struct pathspec\n  Reimplement read_tree_recursive() using tree_entry_interesting()","Junio C Hamano"],["d62c66a0991ef82ed3f73fb40f6c5a4a2e9f86b0","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/merge-sans-branch' into pu\n\n* jc/merge-sans-branch:\n  merge: merge with the default upstream branch without argument\n  merge: match the help text with the documentation\n\nConflicts:\n\tbuiltin/merge.c","Junio C Hamano"],["8c52e413540beaa3f8b78f7a617dfee522f7151e","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/diff-irreversible-delete' into pu\n\n* jc/diff-irreversible-delete:\n  git diff -D: omit the preimage of deletes","Junio C Hamano"],["30617fa1b04891182b316ffe2c85d8e228ca2530","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mz/rebase' into pu\n\n* mz/rebase:\n  rebase: define options in OPTIONS_SPEC","Junio C Hamano"],["16ba4aabe50ca96a5f56a75d37f276cc42df0b76","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'nd/init-gitdir' into pu\n\n* nd/init-gitdir:\n  init, clone: support --separate-git-dir for .git file\n  git-init.txt: move description section up\n\nConflicts:\n\tbuiltin/clone.c","Junio C Hamano"],["5415e3472480fe4c20a552f4aa36fdd5ed88aa68","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/rename-degrade-cc-to-c' into pu\n\n* jc/rename-degrade-cc-to-c:\n  diffcore-rename: fall back to -C when -C -C busts the rename limit\n  diffcore-rename: record filepair for rename src\n  diffcore-rename: refactor \"too many candidates\" logic\n  builtin/diff.c: remove duplicated call to diff_result_code()","Junio C Hamano"],["0a7707090ad281b0b1dcf8feb73ec52b12dfafcd","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/progress-with-pager' into pu\n\n* jk/progress-with-pager:\n  diff: turn on rename detection progress reporting\n  show: turn on rename detection progress reporting\n  progress: use pager's original_stderr if available\n  pager: save the original stderr when redirecting to pager","Junio C Hamano"],["e84114dc27b05d6c069a84b9938d018dc8bdd1fc","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"],["8e5c45111ca02ebfddda6c226401ea682ed1f7c1","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'gr/cvsimport-alternative-cvspass-location' into pu\n\n* gr/cvsimport-alternative-cvspass-location:\n  Look for password in both CVS and CVSNT password files.","Junio C Hamano"],["3adb7b0662a5e43261fd562fd7989a87116c2169","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"],["77a0aa1a6e7e935db70e13f95352a76ef71669c1","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mg/grep-full-tree' into pu\n\n* mg/grep-full-tree:\n  grep: make --full-tree work with pathspecs\n  grep: --full-tree","Junio C Hamano"],["168a383c9183592d883e46061b34c372efd69ba8","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/edit-notes-in-commit-log' into pu\n\n* jk/edit-notes-in-commit-log:\n  [wip] commit: allow editing notes in commit message editor\n  notes: make expand_notes_ref globally accessible\n\nConflicts:\n\tbuiltin/commit.c","Junio C Hamano"],["d5edbc058077c76e15812bbc09607aa897970fc8","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'cn/system-path-tweak' into pu\n\n* cn/system-path-tweak:\n  system_path: use a static buffer","Junio C Hamano"],["bf6636f72a42fd9b6a24189df133f905495f7995","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jh/gitweb-localtime' into pu\n\n* jh/gitweb-localtime:\n  gitweb: javascript ability to adjust time based on timezone","Junio C Hamano"],["091cb4845ca6394e7ac456ccfc790cc28e1a45cd","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/add-u-migration' (early part) into pu\n\n* 'jc/add-u-migration' (early part):\n  add: make \"add -u/-A\" update full tree without pathspec (step 2)","Junio C Hamano"],["9e27ed1b3e8f19f9e340f1727b9a056da5430e2f","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/add-u-migration' into pu\n\n* jc/add-u-migration:\n  add: make \"add -u/-A\" update full tree without pathspec (step 3)","Junio C Hamano"],["788c868b421d59679d1d19980e6e03d3b4bd96a6","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"],["b1b2a01e6a44ed9e86e6a9b372efd563beb7e2c6","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/pull-into-empty' into pu\n\n* jk/pull-into-empty:\n  pull: do not clobber untracked files on initial pull\n  merge: merge unborn index before setting ref\n\nConflicts:\n\tbuiltin/merge.c","Junio C Hamano"]],"repo":"gitster/git","actor":"gitster","ref":"refs/heads/pu","size":22,"head":"ce0e584624d1f7720a93e6d01a14075e6b95ebaf","actor_gravatar":"750680c9dcc7d0be3ca83464a0da49d8","push_id":27734543}