1. 25 2月, 2015 4 次提交
    • J
      Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint · 8f3d03d8
      Junio C Hamano 提交于
      After attempting and failing a password-less authentication
      (e.g. kerberos), libcURL refuses to fall back to password based
      Basic authentication without a bit of help/encouragement.
      
      * bc/http-fallback-to-password-after-krb-fails:
        remote-curl: fall back to Basic auth if Negotiate fails
      8f3d03d8
    • J
      Merge branch 'dk/format-patch-ignore-diff-submodule' into maint · 66061294
      Junio C Hamano 提交于
      Setting diff.submodule to 'log' made "git format-patch" produce
      broken patches.
      
      * dk/format-patch-ignore-diff-submodule:
        format-patch: ignore diff.submodule setting
        t4255: test am submodule with diff.submodule
      66061294
    • J
      Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint · 74419c29
      Junio C Hamano 提交于
      "git rerere" (invoked internally from many mergy operations) did
      not correctly signal errors when told to update the working tree
      files and failed to do so for whatever reason.
      
      * jn/rerere-fail-on-auto-update-failure:
        rerere: error out on autoupdate failure
      74419c29
    • J
      Merge branch 'jk/blame-commit-label' into maint · faf723a6
      Junio C Hamano 提交于
      "git blame HEAD -- missing" failed to correctly say "HEAD" when it
      tried to say "No such path 'missing' in HEAD".
      
      * jk/blame-commit-label:
        blame.c: fix garbled error message
        use xstrdup_or_null to replace ternary conditionals
        builtin/commit.c: use xstrdup_or_null instead of envdup
        builtin/apply.c: use xstrdup_or_null instead of null_strdup
        git-compat-util: add xstrdup_or_null helper
      faf723a6
  2. 06 2月, 2015 1 次提交
  3. 03 2月, 2015 1 次提交
  4. 31 1月, 2015 1 次提交
  5. 28 1月, 2015 2 次提交
  6. 27 1月, 2015 5 次提交
  7. 23 1月, 2015 7 次提交
  8. 21 1月, 2015 9 次提交
  9. 19 1月, 2015 6 次提交
  10. 18 1月, 2015 4 次提交