Permalink
Commits on May 6, 2016
  1. @peff

    genbook2: simplify html fixup

    We can handle "gt" and "lt" in a single regex. Not a big
    deal for this simple case, but as we add more cases, it will
    be nice not to have to repeat ourselves.
    peff committed May 6, 2016
Commits on May 4, 2016
  1. @jnavila @jnavila

    postprocess book v2 for entities in code blocks

    Right now Atlas seems to badly handle html entities in code block so we
    fix it when importing it into the site. This hopefully fixes #753.
    jnavila committed with jnavila May 3, 2016
Commits on May 3, 2016
  1. @jnavila

    fix second paragraph of each chapter

    As described in #738, if a chapter has more than one paragraph in
    introduction, only the first paragraph is imported on the website.
    
    This is due to the #at method only selecting the first matching XPath
    node.
    jnavila committed May 3, 2016
  2. @peff

    Merge pull request #726 from glyn/master

    Fix typo
    peff committed May 3, 2016
  3. @peff

    Merge pull request #714 from dscho/win-community

    community: mention the Windows-specific resources
    peff committed May 3, 2016
  4. @peff

    Merge pull request #739 from gitster/trademark-notice

    Add recommended trademark notice
    peff committed May 3, 2016
Commits on May 2, 2016
  1. @peff

    Merge branch 'fixup-pr-750'

    * fixup-pr-750:
      rake/preindex: return "content" from expand!
      recursively include files in asciidoc
      Allow multiple recursive inclusions in doc
    peff committed May 2, 2016
  2. @peff

    rake/preindex: return "content" from expand!

    Otherwise we not only fail to fix the recursive case in
    1288eb5 (recursively include files in asciidoc, 2016-04-26),
    but we break the non-recursive one, too.
    peff committed May 2, 2016
  3. @peff

    Merge commit 'refs/pull/750/head' of https://github.com/git/git-scm.com

    … into fixup-pr-750
    
    * https://github.com/git/git-scm.com:
      recursively include files in asciidoc
      Allow multiple recursive inclusions in doc
    peff committed May 2, 2016
Commits on Apr 27, 2016
  1. @jnavila

    recursively include files in asciidoc

    Port recursive expansion into the preindex task.
    jnavila committed Apr 26, 2016
Commits on Apr 26, 2016
  1. @jnavila

    Allow multiple recursive inclusions in doc

    The documentation of the git commands uses the include feature of
    asciidoc, and this feature is used recursively for certain
    commands. This patch allows the recursive expansion of included files.
    
    This should fix #699 and #749
    jnavila committed Apr 25, 2016
  2. @peff

    undoing-merges: fix typo

    Fixes #746.
    peff committed Apr 26, 2016
Commits on Apr 20, 2016
  1. @peff

    Merge pull request #743 from git/trademark-x-for-git

    trademark: add 2.2.5 covering "X for git"
    peff committed Apr 20, 2016
Commits on Apr 18, 2016
  1. @peff

    trademark: add 2.2.5 covering "X for git"

    This is a proposed addition from discussion between
    Conservancy and the Git PLC.
    peff committed Apr 18, 2016
  2. @peff

    Merge pull request #741 from dscho/mac-downloads

    Fix auto-updating of the MacOSX downloadable versions
    peff committed Apr 18, 2016
Commits on Apr 14, 2016
  1. @dscho

    Fix auto-updating of the MacOSX downloadable versions

    Apparently SourceForge changed their RSS URLs at some stage in the past,
    putting redirects into the old places. However, we cannot use those
    redirects:
    
    	** Execute mac_downloads
    	rake aborted!
    	redirection forbidden:
    	http://sourceforge.net/api/file/index/project-id/2063428/mtime/desc/limit/20/rss -> https://sourceforge.net/api/file/index/project-id/2063428/mtime/desc/limit/20/rss
    	lib/tasks/downloads.rake:12:in `file_downloads'
    	lib/tasks/downloads.rake:81:in `block in <top (required)>'
    	Tasks: TOP => mac_downloads
    
    Let's just follow the redirection manually.
    
    This should fix the issue where the MacOSX downloads are stuck at Git
    v2.6.4, as reported by Michał Staruch in a top-posted mail to the Git
    mailing list.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 14, 2016
Commits on Apr 13, 2016
  1. @gitster

    Add recommended trademark notice

    SAP wanted to have an officially sanctioned way to give trademark notice in their marketting literature, and Tony (the Conservancy lawyer) gave what is in the "double quotes" in this change as a generic statement we can recommend people to use.
    gitster committed Apr 13, 2016
Commits on Apr 1, 2016
  1. @glyn

    Fix typo

    glyn committed Apr 1, 2016
Commits on Mar 22, 2016
  1. @dscho

    community: mention the Windows-specific resources

    Git for Windows has its own mailing list, and prefers bugs to be submitted
    via the bug tracker.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 22, 2016
Commits on Mar 14, 2016
  1. @peff

    Merge pull request #707 from dbussink/dbussink/latest-rails

    Update to latest rails
    peff committed Mar 14, 2016
  2. @dbussink
  3. @dbussink

    Update to latest rails

    dbussink committed Mar 14, 2016
  4. @peff

    Merge pull request #706 from git/peff/drop-sfc-banner

    drop sfc donation banner
    peff committed Mar 14, 2016
  5. @peff

    drop sfc donation banner

    Conservancy can still use money, of course, but we've been
    running this for 3 months, and they have hit their minimum
    funding goal. It's kind of annoying to have on every page,
    so let's drop it.
    
    We could have a more tasteful donate button somewhere else
    on the site that we have up all the time, but I'll leave
    that for another PR.
    
    I'm leaving the banner CSS in place, as it may be useful
    again (though I suppose if we want to save a few bytes, we
    should drop it, as it's currently unused).
    peff committed Mar 14, 2016
  6. @peff

    Merge pull request #705 from dbussink/dbussink/enforce-https

    Enforce https for entire site
    peff committed Mar 14, 2016
  7. @dbussink

    Enforce https for entire site

    Now that it's properly available behind https, let's enforce it so that
    links get redirect over http and that we can set things like HSTS.
    
    Also updates older links that should be links to *.github.io or link to
    github.com over https.
    dbussink committed Mar 14, 2016
Commits on Feb 22, 2016
  1. @bry4n

    Merge pull request #676 from mattmccutchen/bug-reporting-next

    community: encourage bug reporters to test recent versions
    bry4n committed Feb 22, 2016
  2. @bry4n

    Merge pull request #677 from zigarn/patch-1

    Update some GUIs links
    bry4n committed Feb 22, 2016
  3. @bry4n

    Merge pull request #687 from Ephemera/patch-1

    Fix typo
    bry4n committed Feb 22, 2016
  4. @Ephemera

    Fix typo

    Ephemera committed Feb 22, 2016
Commits on Feb 9, 2016
  1. @zigarn

    Update some GUIs links

    - New link for Git Extensions
    - Update link for git-cola
    - Use HTTPS when possible
    zigarn committed Feb 9, 2016
  2. @mattmccutchen

    community: encourage bug reporters to test recent versions

    Specifically, the latest released version or the "next" branch, as
    reporters are willing.  This is based on:
    
      http://marc.info/?l=git&m=145496979420513&w=2
    mattmccutchen committed Feb 9, 2016
Commits on Feb 4, 2016
  1. @bry4n

    Merge pull request #625 from sharma-rohit/videos-over-https

    [#624] Videos are not playing, because they are served from HTTP, Mad…
    bry4n committed Feb 4, 2016
  2. @bry4n

    Merge pull request #638 from jnavila/progit_fr_v2

    Switch Progit french to 2nd edition
    bry4n committed Feb 4, 2016
  3. @bry4n

    Merge pull request #669 from benwaffle/patch-1

    Update index.html.erb
    bry4n committed Feb 4, 2016