Merge branch 'mm/sort-config-doc'

Junio C Hamano committed almost 18 years ago

Merge branch 'mm/maint-sort-config-doc' into maint

Junio C Hamano committed almost 18 years ago

Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc

Junio C Hamano committed almost 18 years ago

config.txt: alphabetize configuration sections

Matt McCutchen committed almost 18 years ago

xdiff-interface.c: remove 10 duplicated lines

Jim Meyering committed almost 18 years ago

t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible with OSX sed

Marcel Koeppen committed almost 18 years ago

Teach "git diff" to honour --[no-]ext-diff

Junio C Hamano committed almost 18 years ago

send-email: Fix Pine address book parsing

Trent Piepho committed almost 18 years ago

Merge branch 'for-junio' of git://source.winehq.org/~julliard/git/git

Junio C Hamano committed almost 18 years ago

bisect: teach "skip" to accept special arguments like "A..B"

Christian Couder committed almost 18 years ago

builtin_clone: use strbuf in cmd_clone()

Miklos Vajna committed almost 18 years ago

builtin-clone: use strbuf in clone_local() and copy_or_link_directory()

Miklos Vajna committed almost 18 years ago

builtin-clone: use strbuf in guess_dir_name()

Miklos Vajna committed almost 18 years ago

Merge branch 'maint'

Junio C Hamano committed almost 18 years ago

remove the unused files interpolate.c and interpolate.h

René Scharfe committed almost 18 years ago

daemon: deglobalize variable 'directory'

René Scharfe committed almost 18 years ago

daemon: inline fill_in_extra_table_entries()

René Scharfe committed almost 18 years ago

daemon: use strbuf_expand() instead of interpolate()

René Scharfe committed almost 18 years ago

merge-recursive: use strbuf_expand() instead of interpolate()

René Scharfe committed almost 18 years ago

add strbuf_expand_dict_cb(), a helper for simple cases

René Scharfe committed almost 18 years ago