Merge branch 'bw/short-ref-strict'

Junio C Hamano committed over 17 years ago

Merge branch 'da/difftool'

Junio C Hamano committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

doc/gitattributes: clarify location of config text

Jeff King committed over 17 years ago

hook/update: example of how to prevent branch creation

Pierre Habouzit 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

archive test: attributes

René Scharfe committed over 17 years ago

archive: do not read .gitattributes in working directory

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

unpack-trees: do not muck with attributes when we are not checking out

Junio C Hamano committed over 17 years ago

attr: add GIT_ATTR_INDEX "direction"

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

archive tests: do not use .gitattributes in working directory

René Scharfe committed over 17 years ago

Fix buffer overflow in config parser

Thomas Jarosch committed over 17 years ago

remote.c: use shorten_unambiguous_ref

Michael J Gruber committed over 17 years ago

get_local_heads(): do not return random pointer if there is no head

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

Documentation: boolean value may be given by on/off

Michał Kiedrowicz committed over 17 years ago

gitk: Avoid crash if closed while reading references

Pat Thoyts committed over 17 years ago

gitk: Handle external diff tool with spaces in the path

Pat Thoyts committed over 17 years ago

gitk: Remember and restore the window state with the geometry

Pat Thoyts committed over 17 years ago

gitk: Map KP_Divide to focus the search box

Michele Ballabio committed over 17 years ago