From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Dec 2010 18:01:07 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~61
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c302188d194143db74c7f78cb4eff3c1236d3b64;p=git.git

Merge branch 'master' into next

* master:
  Prepare for 1.7.3.4
  use persistent memory for rejected paths
  do not overwrite files in leading path
  lstat_cache: optionally return match_len
  add function check_ok_to_remove()
  t7607: add leading-path tests
  t7607: use test-lib functions and check MERGE_HEAD
  gitk: Add Brazilian Portuguese (pt-BR) translation
  gitk: Make text selectable on Mac
  gitk: Prevent the text pane from becoming editable
  gitk: Add the equivalent of diff --color-words
  gitk: Update Swedish translation (290t)
  gitk: Show notes by default (like git log does)
---

c302188d194143db74c7f78cb4eff3c1236d3b64