Merge git-gui 0.14.0

Junio C Hamano committed over 15 years ago

vcs-svn: avoid using ls command twice

David Barr committed almost 16 years ago

vcs-svn: handle log message with embedded NUL

Jonathan Nieder committed over 15 years ago

vcs-svn: avoid unnecessary copying of log message and author

Jonathan Nieder committed over 15 years ago

vcs-svn: remove buffer_read_string

Jonathan Nieder committed over 15 years ago

vcs-svn: make reading of properties binary-safe

Jonathan Nieder committed over 15 years ago

Sync with 1.7.4.2

Junio C Hamano committed over 15 years ago

Git 1.7.4.2

Junio C Hamano committed over 15 years ago

pull: do not clobber untracked files on initial pull

Jeff King committed over 15 years ago

merge: merge unborn index before setting ref

Jeff King committed over 15 years ago

t7607: clean up stray untracked file

Jeff King committed over 15 years ago

t7607: mark known breakage in test 11 as fixed

Jeff King committed over 15 years ago

gitweb: Fix handling of fractional timezones in parse_date

Jakub Narebski committed over 15 years ago

Improve tree_entry_interesting() handling code

Nguyễn Thái Ngọc Duy committed over 15 years ago

Convert read_tree{,_recursive} to support struct pathspec

Nguyễn Thái Ngọc Duy committed over 15 years ago

Reimplement read_tree_recursive() using tree_entry_interesting()

Nguyễn Thái Ngọc Duy committed over 15 years ago

Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'

Junio C Hamano committed over 15 years ago

Merge branch 'ss/git-gui-mergetool'

Pat Thoyts committed over 15 years ago

git-gui: detect the use of MUI langauge packs on Windows

Pat Thoyts committed over 15 years ago

tests: avoid nonportable {foo,bar} glob

Jonathan Nieder committed over 15 years ago