{"push_id":792115146,"size":58,"distinct_size":19,"ref":"refs/heads/pu","head":"983855023b70a06fa52fe15d71ca2d58b2289267","before":"9d71f19dc2c3642cf952b32ac609dd1bc3284df9","commits":[{"sha":"153ec926b6ec4ac41f7fdfbca705a3afaa7ef192","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'rt/help-strings-fix'\n\n* rt/help-strings-fix:\n  tag, update-ref: improve description of option \"create-reflog\"\n  pull: don't mark values for option \"rebase\" for translation","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/153ec926b6ec4ac41f7fdfbca705a3afaa7ef192"},{"sha":"a9400b01dfc2256ae6e2c3bd3671519188a3a467","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'sg/help-group'\n\n* sg/help-group:\n  Makefile: use SHELL_PATH when running generate-cmdlist.sh","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/a9400b01dfc2256ae6e2c3bd3671519188a3a467"},{"sha":"b8367d1f012ceb86ab48c9024a1bac111bb52dde","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ah/show-ref-usage-string'\n\nBoth \"git show-ref -h\" and \"git show-ref --help\" illustrated that the\n\"--exclude-existing\" option makes the command read list of refs\nfrom its standard input.  Change only the \"show-ref -h\" output to\nhave a pair of \"<>\" around the placeholder that designate an input\nfile, i.e. \"git show-ref --exclude-existing < <ref-list>\".\n\n* ah/show-ref-usage-string:\n  show-ref: place angle brackets around variables in usage string","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/b8367d1f012ceb86ab48c9024a1bac111bb52dde"},{"sha":"cf2094ca6349fe8cfe0f327e36ea386ad8ac98db","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'js/maint-am-skip-performance-regression'\n\nRecent versions of scripted \"git am\" has a performance regression in\n\"git am --skip\" codepath, which no longer exists in the built-in\nversion on the 'master' front.  Fix the regression in the last\nscripted version that appear in 2.5.x maintenance track and older.\n\n* js/maint-am-skip-performance-regression:\n  am --skip/--abort: merge HEAD/ORIG_HEAD tree into index","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/cf2094ca6349fe8cfe0f327e36ea386ad8ac98db"},{"sha":"f4d9753a89bf04011c00e943d85211906e86a0f6","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Update RelNotes to 2.6 to describe leftover bits since -rc2\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/f4d9753a89bf04011c00e943d85211906e86a0f6"},{"sha":"c0d65ddc9be88ed1b285c5f278173f8bd42620de","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ad/bisect-terms' into jch\n\nThe use of 'good/bad' in \"git bisect\" made it confusing to use when\nhunting for a state change that is not a regression (e.g. bugfix).\nThe command learned 'old/new' and then allows the end user to\nsay e.g. \"bisect start --term-old=fast --term=new=slow\" to find a\nperformance regression.\n\nMichael's idea to make 'good/bad' more intelligent does have\ncertain attractiveness ($gname/272867), and makes some of the work\non this topic a moot point.\n\n* ad/bisect-terms:\n  bisect: allow setting any user-specified in 'git bisect start'\n  bisect: add 'git bisect terms' to view the current terms\n  bisect: add the terms old/new\n  bisect: sanity check on terms","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/c0d65ddc9be88ed1b285c5f278173f8bd42620de"},{"sha":"5a080431ea6bce3e84092b1200924a7c20a9b1e1","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ld/p4-import-labels' into jch\n\n* ld/p4-import-labels:\n  git-p4: fix P4 label import for unprocessed commits\n  git-p4: do not terminate creating tag for unknown commit\n  git-p4: failing test for ignoring invalid p4 labels","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/5a080431ea6bce3e84092b1200924a7c20a9b1e1"},{"sha":"52e7ce3e81d11c0ddccd13384021ab46e52efba0","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'kn/for-each-tag-branch' into jch\n\nSome features from \"git tag -l\" and \"git branch -l\" have been made\navailable to \"git for-each-ref\" so that eventually the unified\nimplementation can be shared across all three, in a follow-up\nseries or two.\n\n* kn/for-each-tag-branch:\n  for-each-ref: add '--contains' option\n  ref-filter: implement '--contains' option\n  parse-options.h: add macros for '--contains' option\n  parse-option: rename parse_opt_with_commit()\n  for-each-ref: add '--merged' and '--no-merged' options\n  ref-filter: implement '--merged' and '--no-merged' options\n  ref-filter: add parse_opt_merge_filter()\n  for-each-ref: add '--points-at' option\n  ref-filter: implement '--points-at' option\n  tag: libify parse_opt_points_at()\n  t6302: for-each-ref tests for ref-filter APIs","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/52e7ce3e81d11c0ddccd13384021ab46e52efba0"},{"sha":"dc86aa30b9a2fbcc8a653015f25d7d147a636cf4","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jc/rerere' into jch\n\nCode clean-up and minor fixes.\n\n* jc/rerere: (21 commits)\n  rerere: un-nest merge() further\n  rerere: use \"struct rerere_id\" instead of \"char *\" for conflict ID\n  rerere: call conflict-ids IDs\n  rerere: further clarify do_rerere_one_path()\n  rerere: further de-dent do_plain_rerere()\n  rerere: refactor \"replay\" part of do_plain_rerere()\n  rerere: explain the remainder\n  rerere: explain \"rerere forget\" codepath\n  rerere: explain the primary codepath\n  rerere: explain MERGE_RR management helpers\n  rerere: fix benign off-by-one non-bug and clarify code\n  rerere: explain the rerere I/O abstraction\n  rerere: do not leak mmfile[] for a path with multiple stage #1 entries\n  rerere: stop looping unnecessarily\n  rerere: drop want_sp parameter from is_cmarker()\n  rerere: report autoupdated paths only after actually updating them\n  rerere: write out each record of MERGE_RR in one go\n  rerere: lift PATH_MAX limitation\n  rerere: plug conflict ID leaks\n  rerere: handle conflicts with multiple stage #1 entries\n  ...","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/dc86aa30b9a2fbcc8a653015f25d7d147a636cf4"},{"sha":"4c9ef65befea27da11c45bf386694843500af208","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jc/merge-drop-old-syntax' into jch\n\nStop supporting \"git merge <message> HEAD <commit>\" syntax that\nhas been deprecated since October 2007.\n\n* jc/merge-drop-old-syntax:\n  merge: drop 'git merge <message> HEAD <commit>' syntax","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/4c9ef65befea27da11c45bf386694843500af208"},{"sha":"37ea54a48910ff4cc9ead648d284df73fbf58566","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jh/quiltimport-explicit-series-file' into jch\n\n\"quiltimport\" allows to specify the series file by honoring the\n$QUILT_SERIES environment and also --series command line option.\n\n* jh/quiltimport-explicit-series-file:\n  git-quiltimport: add commandline option --series <file>","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/37ea54a48910ff4cc9ead648d284df73fbf58566"},{"sha":"3b046e7d0345cb0158bddd92dccef360bd4d7bdf","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/async-pkt-line' into jch\n\nThe debugging infrastructure for pkt-line based communication has\nbeen improved to mark the side-band communicatio specifically.\n\n* jk/async-pkt-line:\n  pkt-line: show packets in async processes as \"sideband\"\n  run-command: provide in_async query function","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/3b046e7d0345cb0158bddd92dccef360bd4d7bdf"},{"sha":"c527929ca3911ba9b5821377afcbac1fdbedf33d","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/connect-clear-env' into jch\n\nThe ssh transport, just like any other transport over the network,\ndid not clear GIT_* environment variables, but it is possible to\nuse SendEnv and AcceptEnv to leak them to the remote invocation of\nGit, which is not a good idea at all.  Explicitly clear them just\nlike we do for the local transport.\n\n* jk/connect-clear-env:\n  git_connect: clarify conn->use_shell flag\n  git_connect: clear GIT_* environment for ssh","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/c527929ca3911ba9b5821377afcbac1fdbedf33d"},{"sha":"5d9196cfcae606e513c29c2221af020b5f5db997","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/date-local' into jch\n\n\"git log --date=local\" used to only allow to show the normal\n(default) format in the local timezone. The command learned to take\n'local' as an instruction to use the local timezone with other\nformats, e.g. \"git show --date=rfc-local\".\n\n* jk/date-local:\n  t6300: add tests for \"-local\" date formats\n  t6300: make UTC and local dates different\n  date: make \"local\" orthogonal to date format\n  date: check for \"local\" before anything else\n  t6300: add test for \"raw\" date format\n  t6300: introduce test_date() helper\n  fast-import: switch crash-report date to iso8601\n  Documentation/rev-list: don't list date formats\n  Documentation/git-for-each-ref: don't list date formats\n  Documentation/config: don't list date formats\n  Documentation/blame-options: don't list date formats","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/5d9196cfcae606e513c29c2221af020b5f5db997"},{"sha":"df20e8532b71ce78fa02cf336050d292d2aeb010","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'dt/refs-bisection' into jch\n\nMove the refs used during a \"git bisect\" session to per-worktree\nhierarchy refs/worktree/* so that independent bisect sessions can\nbe done in different worktrees.\n\n* dt/refs-bisection:\n  refs: make refs/bisect/* per-worktree\n  path: optimize common dir checking\n  refs: clean up common_list","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/df20e8532b71ce78fa02cf336050d292d2aeb010"},{"sha":"42b2dcb5b4c0770b3bb0d4a1e962b9551f7b88f9","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nk/stash-show-config' into jch\n\nUsers who are too busy to type three extra keystrokes to ask for\n\"git stash show -p\" can now set stash.showPatch configuration\nvarible to true to always see the actual patch, not just the list\nof paths affected with feel for the extent of damage via diffstat.\n\n* nk/stash-show-config:\n  stash: allow \"stash show\" diff output configurable","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/42b2dcb5b4c0770b3bb0d4a1e962b9551f7b88f9"},{"sha":"97953e4691e0b8a07199efd126a97cb9f7bca341","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ls/p4-path-encoding' into jch\n\n\"git p4\" learned to reencode the pathname it uses to communicate\nwith the p4 depot with a new option.\n\n* ls/p4-path-encoding:\n  git-p4: add config git-p4.pathEncoding","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/97953e4691e0b8a07199efd126a97cb9f7bca341"},{"sha":"1ce3568fa7dfbe36b9cee3e62435bb2ed33f396d","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into jch\n\nAllocation related functions and stdio are unsafe things to call\ninside a signal handler, and indeed killing the pager can cause\nglibc to deadlock waiting on allocation mutex as our signal handler\ntries to free() some data structures in wait_for_pager().  Reduce\nthese unsafe calls.\n\nI seem to recall Peff had other ideas?  Let's revisit this in the\nnext cycle.\n\n* ti/glibc-stdio-mutex-from-signal-handler:\n  pager: don't use unsafe functions in signal handlers","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/1ce3568fa7dfbe36b9cee3e62435bb2ed33f396d"},{"sha":"a6c1ee22ef5d452a01a2a2af788631ed6f149ece","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into jch\n\nBecause \"test_when_finished\" in our test framework queues the\nclean-up tasks to be done in a shell variable, it should not be\nused inside a subshell.  Add a mechanism to allow 'bash' to catch\nsuch uses, and fix the ones that were found.\n\n* jk/test-lint-forbid-when-finished-in-subshell:\n  test-lib-functions: detect test_when_finished in subshell\n  t7800: don't use test_config in a subshell\n  test-lib-functions: support \"test_config -C <dir> ...\"\n  t5801: don't use test_when_finished in a subshell\n  t7610: don't use test_config in a subshell","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/a6c1ee22ef5d452a01a2a2af788631ed6f149ece"},{"sha":"6a7b7d9d3043652f425d7b7a75532f76ef438776","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'as/subtree-with-spaces' into jch\n\nUpdate \"git subtree\" (in contrib/) so that it can take whitespaces\nin the pathnames, not only in the in-tree pathname but the name of\nthe directory that the repository is in.\n\n* as/subtree-with-spaces:\n  contrib/subtree: respect spaces in a repository path\n  t7900-subtree: test the \"space in a subdirectory name\" case","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/6a7b7d9d3043652f425d7b7a75532f76ef438776"}]}