Merge branch 'ks/recursive-rename-add-identical'

Junio C Hamano committed about 16 years ago

Merge git://repo.or.cz/git-gui

Junio C Hamano committed about 16 years ago

disallow branch names that start with a hyphen

Junio C Hamano committed about 16 years ago

mergetool-lib: add a three-way diff view for vim/gvim

Dan McGee committed about 16 years ago

mergetool-lib: combine vimdiff and gvimdiff run blocks

Dan McGee committed about 16 years ago

git-gui 0.13

Pat Thoyts committed about 16 years ago

send-email: use catfile() to concatenate files

Ævar Arnfjörð Bjarmason committed about 16 years ago

git-gui: avoid mis-encoding the copyright message on Windows.

Pat Thoyts committed about 16 years ago

git-gui: Update Swedish translation (521t).

Peter Krefting committed about 16 years ago

t7003: Use test_commit instead of custom function

Brian Gernhardt committed about 16 years ago

log --author: take union of multiple "author" requests

Junio C Hamano committed about 16 years ago

grep: move logic to compile header pattern into a separate helper

Junio C Hamano committed about 16 years ago

t/gitweb-lib.sh: Use tabs for indent consistently

Jakub Narebski committed about 16 years ago

t/gitweb-lib.sh: Use GIT_BUILD_DIR

Jakub Narebski committed about 16 years ago

Merge branch 'maint'

Junio C Hamano committed about 16 years ago

ls-tree $di $dir: do not mistakenly recurse into directories

Junio C Hamano committed about 16 years ago

t3101: modernise style

Junio C Hamano committed about 16 years ago

vcs-svn: Fix some printf format compiler warnings

Ramsay Jones committed about 16 years ago

compat/nedmalloc: don't force NDEBUG on the rest of git

René Scharfe committed about 16 years ago

Git 1.7.3 rc1

Junio C Hamano committed about 16 years ago