![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Dec 2010 18:01:07 +0000 (10:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Dec 2010 18:01:07 +0000 (10:01 -0800) | ||
| commit | c302188d194143db74c7f78cb4eff3c1236d3b64 | |
| tree | 06290cdb9aff7b72935c7c8d374ec893198e95a1 | tree | snapshot |
| parent | 13fdbdd8f81ada53cdbba9b1c0bf5b7b046aa497 | commit | diff |
| parent | 74f6e0505bb854db5b25ba977432471fed218a73 | commit | diff |
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)
* 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)