GitHub PushEvent at 2014-10-24 06:12:50
Repository: git
Actor: PKRoma
Payload: {"shas":[["f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","mergetool: rename bc3 to bc\n\nBeyond Compare version 4 works the same way as version 3, so rename\nthe existing \"bc3\" adaptor to just \"bc\", while keeping \"bc3\" as a\nbackward compatible wrapper.\n\nNoticed-by: Olivier Croquette <ocroquette@free.fr>\nHelped-by: David Aguilar <davvid@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano",true],["1a77a73a293919c553fa442fd08e96063e51d8c4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'oc/mergetools-beyondcompare' into jch\n\n* oc/mergetools-beyondcompare:\n  mergetool: rename bc3 to bc","Junio C Hamano",true],["6936b5859c47b826437218fbfc0e2bc0935f7136","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","diff -B -M: fix output for \"copy and then rewrite\" case\n\nStarting from a single file, A, if you create B as a copy of A (and\npossibly make some edit) and then make extensive change to A, you\nwill see:\n\n    $ git diff -C --name-status\n    C89    A    B\n    M      A\n\nwhich is expected.  However, if you ask the same question in a\ndifferent way, you see this:\n\n    $ git diff -B -M --name-status\n    R89    A    B\n    M100   A\n\ntelling us that A was rename-edited into B (as if \"A will no longer\nexist as the result\") and at the same time A itself was extensively\nedited.\n\nIn this case, because the resulting tree still does have file A\n(even if it has contents vastly different from the original), we\nshould use \"C\"opy, not \"R\"ename, to avoid hinting that A somehow\ngoes away.\n\nTwo existing tests were depending on the wrong behaviour, and fixed.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano",true],["1568c45a8ea54879838c88838f640876a7a5c09b","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/diff-b-m' into jch\n\n* jc/diff-b-m:\n  diff -B -M: fix output for \"copy and then rewrite\" case","Junio C Hamano",true],["08dc09b4755efe3831e559cb59160b32cfe3608d","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/push-cert-hmac-optim' into pu\n\nThis is \"we could do this if we wanted to\", not \"we measured and it\nimproves performance critical codepath\".\n\n* jc/push-cert-hmac-optim:\n  receive-pack: truncate hmac early and convert only necessary bytes\n  sha1_to_hex: split out \"hex-format n bytes\" helper and use it","Junio C Hamano",true],["a6638c54eefef4aa422408424bebc70d826cc5c2","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'tr/remerge-diff' into pu\n\n\"log -p\" output learns a new way to let users inspect a merge\ncommit by showing the differences between the automerged result\nwith conflicts the person who recorded the merge would have seen\nand the final conflict resolution that was recorded in the merge.\n\n* tr/remerge-diff:\n  log --remerge-diff: show what the conflict resolution changed\n  name-hash: allow dir hashing even when !ignore_case\n  merge-recursive: allow storing conflict hunks in index\n  merge_diff_mode: fold all merge diff variants into an enum\n  combine-diff: do not pass revs->dense_combined_merges redundantly\n  merge-recursive: -Xindex-only to leave worktree unchanged\n  merge-recursive: internal flag to avoid touching the worktree\n  merge-recursive: remove dead conditional in update_stages()\n\n# Conflicts:\n# \tmerge-recursive.c","Junio C Hamano",true],["5ffd8250a8fb578fe5ca4be14ac0f460ebe6c76d","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'hv/submodule-config' into pu\n\nKicked back to 'pu' per request ($gmane/255610).\n\n* hv/submodule-config:\n  do not die on error of parsing fetchrecursesubmodules option\n  use new config API for worktree configurations of submodules\n  extract functions for submodule config set and lookup\n  implement submodule config cache for lookup of submodule names","Junio C Hamano",true],["e13ad7631d34b9cd458856cf038fa8c14b481e40","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jt/timer-settime' into pu\n\nReviewed, discussed and wanting for a reroll.\n\n* jt/timer-settime:\n  use timer_settime() for new platforms\n  autoconf: check for timer_settime()\n  autoconf: check for struct itimerspec\n  autoconf: check for struct sigevent\n  autoconf: check for struct timespec\n  autoconf: check for timer_t","Junio C Hamano",true],["732fc45c99b276b87ffe3925be152b0420bfc11d","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mt/patch-id-stable' into pu\n\nTeaches \"git patch-id\" to compute the patch ID that does not change\nwhen the files in a single patch is reordered. As this new algorithm\nis backward incompatible, the last bit to flip it to be the default\nis left out of 'master' for now.\n\nNobody seems to be jumping up & down requesting this last step,\nwhich makes the result somewhat backward incompatible.\n\n* mt/patch-id-stable:\n  patch-id: change default to stable","Junio C Hamano",true],["9211f08a32af2938bdf8ec9abb1bead96b5b37af","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/pack-bitmap' into pu\n\nHold, waiting for Karsten's replacement.\n\n* jk/pack-bitmap:\n  pack-bitmap: do not use gcc packed attribute","Junio C Hamano",true],["411f5f787de314aeeb2db5415c9f21dd1c61dd64","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'bg/rebase-off-of-previous-branch' into pu\n\nTeach \"git rebase -\" to report the concrete name of the branch\n(i.e. the previous one).\n\nBut it stops short and does not do the same for \"git rebase @{-1}\".\n\n* bg/rebase-off-of-previous-branch:\n  git-rebase: print name of rev when using shorthand","Junio C Hamano",true],["ed7da52b9232f62a48fab010252fdd3274bf727e","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'rb/merge-prepare-commit-msg-hook' into pu\n\nExpose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that\nrun during \"git merge\".  The log message stresses too much on one\nhook, prepare-commit-msg, but it would equally apply to other hooks\nlike post-merge, I think.\n\n* rb/merge-prepare-commit-msg-hook:\n  merge: drop unused arg from abort_commit method signature\n  merge: make prepare_to_commit responsible for write_merge_state\n  t7505: ensure cleanup after hook blocks merge\n  t7505: add missing &&\n\n# Conflicts:\n# \tbuiltin/merge.c\n# \tt/t7505-prepare-commit-msg-hook.sh","Junio C Hamano",true],["21dbe5f7e1f5b8f8ec4f74e84a910b87a0b9c7ae","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/show-branch' into pu\n\n* jc/show-branch:\n  show-branch: use commit slab to represent bitflags of arbitrary width\n  show-branch.c: remove \"all_mask\"\n  show-branch.c: abstract out \"flags\" operation\n  show-branch.c: lift all_mask/all_revs to a global static\n  show-branch.c: update comment style","Junio C Hamano",true],["95555360865f4211a52847a1886d44d3fe3290c4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'tg/perf-lib-test-perf-cleanup' into pu\n\nAdd test_perf_cleanup shell function to the perf suite, that allows\nthe script writers to define a test with a clean-up action.\n\nWill hold.\n\n* tg/perf-lib-test-perf-cleanup:\n  perf-lib: add test_perf_cleanup target\n  perf-lib: split starting the test from the execution","Junio C Hamano",true],["a80fb8c93e98bd4a877fe5c939b3e88249f1980c","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'ab/add-interactive-show-diff-func-name' into pu\n\n* ab/add-interactive-show-diff-func-name:\n  SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks\n  git-add--interactive: Preserve diff heading when splitting hunks","Junio C Hamano",true],["7f8e685316e7c4c70bcffafce70f659466b3e67c","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'ss/userdiff-update-csharp-java' into pu\n\nReviews sent; waiting for a response.\n\n* ss/userdiff-update-csharp-java:\n  userdiff: support Java try keyword\n  userdiff: support C# async methods and correct C# keywords","Junio C Hamano",true],["81946281238486e43b7bb420282223e4044739cd","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/gitweb-utf8-in-links' into pu\n\n$gmane/250758?\n\n* jn/gitweb-utf8-in-links:\n  gitweb: Harden UTF-8 handling in generated links","Junio C Hamano",true],["28d8bd48a241cbfc9a860635ce64203a35d666f2","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","### broken or queued too late for the day's cycle","Junio C Hamano",true],["f1d5e7446b3610a80ab82506d2761c5dfef68776","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/graph-post-root-gap' into pu\n\nThis was primarily a RFH ($gmane/239580).\n\n* jc/graph-post-root-gap:\n  WIP: document what we want at the end\n  graph: remove unused code a bit\n  graph: stuff the current commit into graph->columns[]","Junio C Hamano",true],["3cd1892830be59baff9816c0bb0d7c9031ea1f7f","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'je/quiltimport-no-fuzz' into pu\n\n\"quiltimport\" drove \"git apply\" always with -C1 option to reduce\ncontext of the patch in order to give more chance to somewhat stale\npatches to apply.  Add an \"--exact\" option to disable, and also\n\"-C$n\" option to customize this behaviour.  The top patch\noptionally flips the default to \"--exact\".\n\n* je/quiltimport-no-fuzz:\n  git-quiltimport: flip the default not to allow fuzz\n  git-quiltimport.sh: allow declining fuzz with --exact option","Junio C Hamano",true]],"size":21,"ref":"refs/heads/pu","head":"f435529742b864b4b54ab7c281ff029529312f64"}