convert: give saner names to crlf/eol variables, types and functions

Junio C Hamano committed over 15 years ago

convert: rename the "eol" global variable to "core_eol"

Junio C Hamano committed over 15 years ago

index_fd(): split into two helper functions

Junio C Hamano committed over 15 years ago

index_fd(): turn write_object and format_check arguments into one flag

Junio C Hamano committed over 15 years ago

t1507: avoid "${parameter<op>'word'}" inside double-quotes

Junio C Hamano committed over 15 years ago

completion: move private shopt shim for zsh to __git_ namespace

Jonathan Nieder committed over 15 years ago

t3701: add-p-fix makes the last test to pass

Junio C Hamano committed over 15 years ago

rerere: libify rerere_clear() and rerere_gc()

Junio C Hamano committed over 15 years ago

Use a temporary index for git commit --interactive

Conrad Irwin committed over 15 years ago

Remove gitweb/gitweb.cgi and other legacy targets from main Makefile

Jakub Narebski committed over 15 years ago

git-instaweb: Simplify build dependency on gitweb

Jakub Narebski committed over 15 years ago

tests: check git does not barf on merge.ff values for future versions of git

Jonathan Nieder committed over 15 years ago

tests: teach verify_parents to check for extra parents

Jonathan Nieder committed over 15 years ago

merge: introduce merge.ff configuration variable

Junio C Hamano committed over 15 years ago

Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config

Junio C Hamano committed over 15 years ago

merge: make branch.<name>.mergeoptions correctly override merge.<option>

Junio C Hamano committed over 15 years ago

tests: eliminate unnecessary setup test assertions

Jonathan Nieder committed over 15 years ago

Update draft release notes to 1.7.6

Junio C Hamano committed over 15 years ago

Merge branch 'jn/run-command-error-failure'

Junio C Hamano committed over 15 years ago

Merge branch 'js/info-man-path'

Junio C Hamano committed over 15 years ago