Skip to content
  • Junio C Hamano's avatar
    Merge branch 'maint-1.7.6' into maint · f0911b99
    Junio C Hamano authored
    * maint-1.7.6:
      notes_merge_commit(): do not pass temporary buffer to other function
      gitweb: Fix links to lines in blobs when javascript-actions are enabled
      mergetool: no longer need to save standard input
      mergetool: Use args as pathspec to unmerged files
      t9159-*.sh: skip for mergeinfo test for svn <= 1.4
      date.c: Support iso8601 timezone formats
      remote: only update remote-tracking branch if updating refspec
      remote rename: warn when refspec was not updated
      remote: "rename o foo" should not rename ref "origin/bar"
      remote: write correct fetch spec when renaming remote 'remote'
    f0911b99