{"shas":[["f3a70e9cc6d31e3cb8158f64be13c594226bf03f","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'bc/fortran-userdiff' into maint\n\n* bc/fortran-userdiff:\n  userdiff.c: add builtin fortran regex patterns","Junio C Hamano"],["9f6774ed86a9ac22142c0b37e26e67eb1d032962","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'ks/no-textconv-symlink' into maint\n\n* ks/no-textconv-symlink:\n  blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''\n  blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks\n  blame,cat-file: Prepare --textconv tests for correctly-failing conversion program","Junio C Hamano"],["a49e9af4939c1223020db7915ee612d836c1bcdc","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'tr/maint-merge-file-subdir' into maint\n\n* tr/maint-merge-file-subdir:\n  merge-file: correctly find files when called in subdir\n  prefix_filename(): safely handle the case where pfx_len=0","Junio C Hamano"],["1f238da57334ca0155ae7560b173eefc8c4c157a","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'bg/maint-gitweb-test-lib' into maint\n\n* bg/maint-gitweb-test-lib:\n  t/gitweb-lib: Don't pass constant to decode_utf8","Junio C Hamano"],["54d04f2b077496739f9fdf04ff8abf24feb33576","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/add-e-doc' into maint\n\n* jk/add-e-doc:\n  docs: give more hints about how \"add -e\" works\n  docs: give more hints about how \"add -e\" works","Junio C Hamano"],["47f16e8b110d84bacb586a1b7183ee4bb781c980","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'cb/maint-orphan-merge-noclobber' into maint\n\n* cb/maint-orphan-merge-noclobber:\n  do not overwrite untracked during merge from unborn branch","Junio C Hamano"],["be1b0558777dafa7b8993bc371cbe4078350e4e9","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Documentation: Fix mark-up of lines with more than one tilde\n\nThe manual pages of cherry-pick and revert had examples with two revisions\non the same line in the examples section, that looked like this:\n\n    git cherry-pick master~4 master~2::\n\nUnfortunately, this is taken as a mark-up to make the part between two\ntildes, \"4 master\", subscript.  Use {tilde} to make it explicit that we\ndo want ~ characters in these places (backslash does not help).\n\nReported-by: Sylvain Rabot <sylvain.rabot@f-secure.com>\nHelped-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["cbcab75c54b5956dcaa4f24a4074bc99adc49629","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Git 1.7.0.8\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["bd01c6de67715586f7527115bb4f74e7929b3b66","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Git 1.7.1.3\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["2850c1a882ff78e181d0e44b54b595e6b272a02b","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Git 1.7.2.4\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["7e4eb210bdf2a612d8bf4cc106d99ba190f73e3e","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Prepare for 1.7.3.3\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"]],"ref":"refs/heads/maint","push_id":20885235,"head":"7e4eb210bdf2a612d8bf4cc106d99ba190f73e3e","size":11}