1. 13 Sep, 2016 1 commit
  2. 06 Jun, 2016 5 commits
    • Junio C Hamano's avatar
      Git 2.8.4 · 0b65a8db
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      0b65a8db
    • Junio C Hamano's avatar
      Merge branch 'kb/msys2-tty' into maint · 1676827c
      Junio C Hamano authored
      The "are we talking with TTY, doing an interactive session?"
      detection has been updated to work better for "Git for Windows".
      
      * kb/msys2-tty:
        mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
      1676827c
    • Junio C Hamano's avatar
      Merge branch 'da/difftool' into maint · 389c3289
      Junio C Hamano authored
      "git difftool" learned to handle unmerged paths correctly in
      dir-diff mode.
      
      * da/difftool:
        difftool: handle unmerged files in dir-diff mode
        difftool: initialize variables for readability
      389c3289
    • Junio C Hamano's avatar
      Merge branch 'tb/core-eol-fix' into maint · 7dcbf891
      Junio C Hamano authored
      A couple of bugs around core.autocrlf have been fixed.
      
      * tb/core-eol-fix:
        convert.c: ident + core.autocrlf didn't work
        t0027: test cases for combined attributes
        convert: allow core.autocrlf=input and core.eol=crlf
        t0027: make commit_chk_wrnNNO() reliable
      7dcbf891
    • Junio C Hamano's avatar
      Merge branch 'ar/diff-args-osx-precompose' into maint · 05781d37
      Junio C Hamano authored
      Many commands normalize command line arguments from NFD to NFC
      variant of UTF-8 on OSX, but commands in the "diff" family did
      not, causing "git diff $path" to complain that no such path is
      known to Git.  They have been taught to do the normalization.
      
      * ar/diff-args-osx-precompose:
        diff: run arguments through precompose_argv
      05781d37
  3. 31 May, 2016 5 commits
    • Junio C Hamano's avatar
      More topics for 2.8.4 · 4b0891ff
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      4b0891ff
    • Junio C Hamano's avatar
      Merge branch 'sb/submodule-deinit-all' into maint · 3296e1a9
      Junio C Hamano authored
      Correct faulty recommendation to use "git submodule deinit ." when
      de-initialising all submodules, which would result in a strange
      error message in a pathological corner case.
      
      * sb/submodule-deinit-all:
        submodule deinit: require '--all' instead of '.' for all submodules
      3296e1a9
    • Junio C Hamano's avatar
      Merge branch 'bn/http-cookiefile-config' into maint · e646a82c
      Junio C Hamano authored
      "http.cookieFile" configuration variable clearly wants a pathname,
      but we forgot to treat it as such by e.g. applying tilde expansion.
      
      * bn/http-cookiefile-config:
        http: expand http.cookieFile as a path
        Documentation: config: improve word ordering for http.cookieFile
      e646a82c
    • Junio C Hamano's avatar
      Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint · 68a6e976
      Junio C Hamano authored
      Running tests with '-x' option to trace the individual command
      executions is a useful way to debug test scripts, but some tests
      that capture the standard error stream and check what the command
      said can be broken with the trace output mixed in.  When running
      our tests under "bash", however, we can redirect the trace output
      to another file descriptor to keep the standard error of programs
      being tested intact.
      
      * jk/test-send-sh-x-trace-elsewhere:
        test-lib: set BASH_XTRACEFD automatically
      68a6e976
    • Junio C Hamano's avatar
      Merge branch 'js/name-rev-use-oldest-ref' into maint · 9ee8f940
      Junio C Hamano authored
      "git describe --contains" often made a hard-to-justify choice of
      tag to give name to a given commit, because it tried to come up
      with a name with smallest number of hops from a tag, causing an old
      commit whose close descendant that is recently tagged were not
      described with respect to an old tag but with a newer tag.  It did
      not help that its computation of "hop" count was further tweaked to
      penalize being on a side branch of a merge.  The logic has been
      updated to favor using the tag with the oldest tagger date, which
      is a lot easier to explain to the end users: "We describe a commit
      in terms of the (chronologically) oldest tag that contains the
      commit."
      
      * js/name-rev-use-oldest-ref:
        name-rev: include taggerdate in considering the best name
      9ee8f940
  4. 26 May, 2016 21 commits
  5. 18 May, 2016 8 commits