{"thread":{"id":"15241","subject":"What's in git.git (Aug 2008, #07; Wed, 27)","startedAt":"2008-08-28T03:01:38Z","lastAt":"2008-08-28T03:01:38Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"88863","messageId":"7vy72hj10t.fsf@gitster.siamese.dyndns.org","threadId":"15241","inReplyTo":null,"subject":"What's in git.git (Aug 2008, #07; Wed, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-28T03:01:38Z","receivedAt":"2008-08-28T03:01:38Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Handful fixes went to 1.6.0.1 and then a few more are on 'maint'.\n\nOn the 'master' front, among other things:\n\n - \"git cherry-pick\" can reuse earlier conflict resolution.\n\n - \"git merge\" can use a custom strategy (if you write one).\n\n - \"git-shell\" was broken and then fixed.\n\n - \"git submodule sync\" is a new subcommand.\n\n* The 'maint' branch has these fixes since the last announcement.\n\nAlexander Gavrilov (1):\n  Respect core.autocrlf in combined diff\n\nJeff King (1):\n  Fix \"git log -i --grep\"\n\nJonathan Nieder (2):\n  Documentation: clarify pager.<cmd> configuration\n  Documentation: clarify pager configuration\n\nJunio C Hamano (3):\n  merge: fix numerous bugs around \"trivial merge\" area\n  GIT 1.6.0.1\n  ctype.c: protect tiny C preprocessor constants\n\nLinus Torvalds (1):\n  index-pack: be careful after fixing up the header/footer\n\nMiklos Vajna (1):\n  Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX\n\nNguyễn Thái Ngọc Duy (1):\n  index-pack: setup git repository\n\nRamsay Allan Jones (2):\n  Fix a warning (on cygwin) to allow -Werror\n  Suppress some bash redirection error messages\n\nSimon Hausmann (1):\n  Clean up the git-p4 documentation\n\n\n* The 'master' branch has these since the last announcement\n  in addition to the above.\n\nAbhijit Menon-Sen (1):\n  Make cherry-pick use rerere for conflict resolution.\n\nAndreas Färber (1):\n  Makefile: always provide a fallback when hardlinks fail\n\nDavid Aguilar (1):\n  git-submodule: add \"sync\" command\n\nGustaf Hendeby (1):\n  Update .gitignore to ignore git-help\n\nJeff King (1):\n  format-patch: use default diff format even with patch options\n\nJunio C Hamano (7):\n  builtin-add.c: restructure the code for maintainability\n  builtin-add.c: optimize -A option and \"git add .\"\n  shell: do not play duplicated definition games to shrink the executable\n  Build-in \"git-shell\"\n  Fix \"git-merge -s bogo\" help text\n  t7606: fix custom merge test\n  Revert \"Build-in \"git-shell\"\"\n\nMark Levedahl (3):\n  git-submodule.sh - Remove trailing / from URL if found\n  git-submodule.sh - Remove trailing / from URL if found\n  git-submodule - Use \"get_default_remote\" from git-parse-remote\n\nMiklos Vajna (6):\n  builtin-help: make some internal functions available to other builtins\n  builtin-merge: allow using a custom strategy\n  Add a new test for using a custom merge strategy\n  Add a second testcase for handling invalid strategies in git-merge\n  builtin-help: always load_command_list() in cmd_help()\n  Builtin git-help.\n\nNicolas Pitre (1):\n  discard revindex data when pack list changes\n\nSimon Hausmann (1):\n  Make it possible to abort the submission of a change to Perforce\n\nTommi Virtanen (1):\n  Install git-shell in bindir, too\n"}]}