Merge branch 'maint'

Junio C Hamano committed almost 19 years ago

gitattributes: fix relative path matching

Junio C Hamano committed almost 19 years ago

config: add test cases for empty value and no value config variables.

Christian Couder committed almost 19 years ago

Improve bash prompt to detect various states like an unfinished merge

Robin Rosenberg committed about 19 years ago

compat: Add simplified merge sort implementation from glibc

Brian Downing committed almost 19 years ago

fix config reading in tests

Jeff King committed almost 19 years ago

allow suppressing of global and system config

Jeff King committed almost 19 years ago

Merge branch 'maint'

Junio C Hamano committed almost 19 years ago

Fix parsing numeric color values

Timo Hirvonen committed almost 19 years ago

gitweb: Make feed entries point to commitdiff view

Florian La Roche committed almost 19 years ago

git-svn: improve repository URL matching when following parents

Eric Wong committed almost 19 years ago

Make git-remote.perl "use strict" compliant

Rafael Garcia-Suarez committed almost 19 years ago

safecrlf: Add mechanism to warn about irreversible crlf conversions

Steffen Prohaska committed almost 19 years ago

git-commit: add a prepare-commit-msg hook

Paolo Bonzini committed almost 19 years ago

git-commit: Refactor creation of log message.

Paolo Bonzini committed almost 19 years ago

git-commit: set GIT_EDITOR=: if editor will not be launched

Paolo Bonzini committed almost 19 years ago

git-commit: support variable number of hook arguments

Paolo Bonzini committed almost 19 years ago

INSTALL: git-merge no longer uses cpio

Gerrit Pape committed almost 19 years ago

Fix misuse of prefix_path()

Johannes Sixt committed almost 19 years ago

instaweb: use 'git-web--browse' to launch browser.

Christian Couder committed almost 19 years ago