1. 15 Oct, 2012 4 commits
  2. 05 Oct, 2012 3 commits
  3. 15 Sep, 2012 6 commits
  4. 12 Sep, 2012 5 commits
    • Junio C Hamano's avatar
      Merge branch 'jc/apply-binary-p0' into maint-1.7.11 · 1403db49
      Junio C Hamano authored
      "git apply -p0" did not parse pathnames on "diff --git" line
      correctly.  This caused patches that had pathnames in no other
      places to be mistakenly rejected (most notably, binary patch that
      does not rename nor change mode).  Textual patches, renames or mode
      changes have preimage and postimage pathnames in different places in
      a form that can be parsed unambiguously and did not suffer from this
      problem.
      
      * jc/apply-binary-p0:
        apply: compute patch->def_name correctly under -p0
      1403db49
    • Junio C Hamano's avatar
      Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 · eaff724b
      Junio C Hamano authored
      "git log .." errored out saying it is both rev range and a path when
      there is no disambiguating "--" is on the command line.  Update the
      command line parser to interpret ".." as a path in such a case.
      
      * jc/dotdot-is-parent-directory:
        specifying ranges: we did not mean to make ".." an empty set
      eaff724b
    • Junio C Hamano's avatar
      Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1.7.11 · 1b8bc86b
      Junio C Hamano authored
      The synopsis said "checkout [-B branch]" to make it clear the
      branch name is a parameter to the option, but the heading for the
      option description was "-B::", not "-B branch::", making the
      documentation misleading.
      
      * jc/maint-doc-checkout-b-always-takes-branch-name:
        doc: "git checkout -b/-B/--orphan" always takes a branch name
      1b8bc86b
    • Junio C Hamano's avatar
      Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11 · 7d9483c2
      Junio C Hamano authored
      Pushing to smart HTTP server with recent Git fails without having
      the username in the URL to force authentication, if the server is
      configured to allow GET anonymously, while requiring authentication
      for POST.
      
      * jk/maint-http-half-auth-push:
        http: prompt for credentials on failed POST
        http: factor out http error code handling
        t: test http access to "half-auth" repositories
        t: test basic smart-http authentication
        t/lib-httpd: recognize */smart/* repos as smart-http
        t/lib-httpd: only route auth/dumb to dumb repos
        t5550: factor out http auth setup
        t5550: put auth-required repo in auth/dumb
      7d9483c2
    • Junio C Hamano's avatar
      Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11 · 92c830dd
      Junio C Hamano authored
      "git for-each-ref" did not honor multiple "--sort=<key>" arguments
      correctly.
      
      * kk/maint-for-each-ref-multi-sort:
        for-each-ref: Fix sort with multiple keys
        t6300: test sort with multiple keys
      92c830dd
  5. 11 Sep, 2012 16 commits
  6. 10 Sep, 2012 6 commits