1. 09 Jul, 2018 1 commit
  2. 07 Jul, 2018 4 commits
  3. 29 Jun, 2018 1 commit
  4. 09 Jun, 2018 4 commits
  5. 03 Jun, 2018 3 commits
  6. 02 Jun, 2018 3 commits
  7. 01 Jun, 2018 7 commits
  8. 31 May, 2018 6 commits
  9. 27 May, 2018 1 commit
  10. 23 May, 2018 2 commits
    • Ben North's avatar
      Avoid error if gitk not found on windows-nt · 4c6e9ed0
      Ben North authored
      On windows-nt, if gitk is not in the path, then the 'which' produces
      nothing to stdout (although it does produce an error message to
      stderr).  The magit-git-string call then returns nil, which is not a
      valid input to file-executable-p, causing an error when trying to
      autoload anything defined in magit-extras.el.
      
      Include 'exe' as a first conjunct to the 'and', short-circuiting the
      file-executable-p test in this case.
      4c6e9ed0
    • Jonas Bernoulli's avatar
      magit-insert-remote-branches: Guard against empty message · 22747048
      Jonas Bernoulli authored
      Fixes #3454, like 44f8e45d fixed #3382.
      22747048
  11. 22 May, 2018 3 commits
    • Kyle Meyer's avatar
      dc687d59
    • Kyle Meyer's avatar
      relnotes: Update for #3443 · b07ef8f8
      Kyle Meyer authored
      b07ef8f8
    • Li-Yun Chang's avatar
      magit-blame--format-time-string: Correct timezone handling · 9d6e9c84
      Li-Yun Chang authored
      Because the time variable is an Unix time which is not related to time zone,
      we don't have to update time according to time zone.
      
      To deal with the different behavior of `format-time-string`
      
      In emacs version > 25 :
      
      If time-format contains the time zone symbol ( %z or %Z ),
      use tz-in-second to format the time in committer time zone or author time zone.
      
      If time-format doesn't contain the time zone symbol ( %z or %Z ),
      assign tz-in-second to nil to format the time in local time zone.
      
      In emacs version < 25 :
      
      Just format the time string in local time zone
      9d6e9c84
  12. 19 May, 2018 1 commit
    • Jonas Bernoulli's avatar
      magit-diff-wash-diffstat: Handle renames · 66d9558f
      Jonas Bernoulli authored
      But ignore the special-case of file-names that contain " => ".
      Handling that properly would require the use of "-z", which would
      require changes all over the place and this code is going to be
      refactored soon anyway.
      
      Fixes #3440.
      66d9558f
  13. 17 May, 2018 4 commits