Merge branch 'jc/merge-blobs' into maint

Junio C Hamano committed over 13 years ago

Merge branch 'jc/doc-maintainer' into maint

Junio C Hamano committed over 13 years ago

Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into maint

Junio C Hamano committed over 13 years ago

completion: handle path completion and colon for tcsh script

Marc Khouzam committed over 13 years ago

config.mak.in: remove unused definitions

Junio C Hamano committed over 13 years ago

builtin/apply: tighten (dis)similarity index parsing

John Keeping committed over 13 years ago

combine-diff: lift 32-way limit of combined diff

Junio C Hamano committed over 13 years ago

doc: generate a list of valid merge tools

David Aguilar committed over 13 years ago

mergetool--lib: list user configured tools in '--tool-help'

John Keeping committed over 13 years ago

mergetool--lib: add functions for finding available tools

David Aguilar committed over 13 years ago

Honor configure's htmldir switch

Christoph J. Thompson committed over 13 years ago

Makefile: explicitly set target name for autogenerated dependencies

Jonathan Nieder committed almost 15 years ago

mergetools: teach tortoisemerge to handle filenames with SP correctly

Sven Strickroth committed over 13 years ago

Rename {git- => git}remote-helpers.txt

John Keeping committed over 13 years ago

run-command: be more informative about what failed

Stephen Boyd committed over 13 years ago

Documentation: StGit is the right spelling, not StGIT

Thomas Ackermann committed over 13 years ago

Documentation: describe the "repository" in repository-layout

Junio C Hamano committed over 13 years ago

Documentation: add a description for 'gitfile' to glossary

Thomas Ackermann committed over 13 years ago

Documentation: do not use undefined terms git-dir and git-file

Thomas Ackermann committed over 13 years ago

Documentation: the name of the system is 'Git', not 'git'

Thomas Ackermann committed over 13 years ago