gitk: Use themed tk widgets

Pat Thoyts committed over 17 years ago

Merge branch 'master' into dev

Paul Mackerras committed over 17 years ago

gitk: Add Russian translation

Alex Riesen committed over 17 years ago

Clarify kind of conflict in merge-one-file helper

Alex Riesen committed over 17 years ago

improve error message in config.c

Alex Riesen committed over 17 years ago

print unlink(2) errno in copy_or_link_directory

Alex Riesen committed over 17 years ago

replace direct calls to unlink(2) with unlink_or_warn

Alex Riesen committed over 17 years ago

Introduce an unlink(2) wrapper which gives warning if unlink failed

Alex Riesen committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

daemon.c: fix segfault on OS X

Benjamin Kramer committed over 17 years ago

merge-recursive: do not die on a conflicting submodule

Junio C Hamano committed over 17 years ago

git config: error when editing a repo config and not being in one

Felipe Contreras committed over 17 years ago

parseopt: fix documentation for --keep-dashdash

Uwe Kleine-König committed over 17 years ago

Rename core.unreliableHardlinks to core.createObject

Johannes Schindelin committed over 17 years ago

Merge branch 'maint-1.6.1' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed over 17 years ago

diff -c -p: do not die on submodules

Junio C Hamano committed over 17 years ago

git-gui: Update Russian translation

Alex Riesen committed over 17 years ago

doc: consistently use ASCIIDOC_EXTRA

Eric Blake committed over 17 years ago

Makefile: installing git in cygwin 1.7.0

Eric Blake committed over 17 years ago