From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:13:27 +0000 (-0700)
Subject: Merge branch 'maint-1.7.6' into maint
X-Git-Tag: v1.7.8-rc0~7^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0911b996cac9b89b9175676f74bbcb5a9a9e34f;p=git.git

Merge branch 'maint-1.7.6' into maint

* 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'
---

f0911b996cac9b89b9175676f74bbcb5a9a9e34f