Merge branch 'js/log-abbrev-commit-config'

Junio C Hamano committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Teach read-tree the -n|--dry-run option

Jens Lehmann committed over 15 years ago

unpack-trees: add the dry_run flag to unpack_trees_options

Jens Lehmann committed over 15 years ago

merge: reword the final message

Junio C Hamano committed over 15 years ago

userformat_find_requirements(): find requirement for the correct format

Junio C Hamano committed over 15 years ago

gitweb: Refactor reading and parsing config file into read_config_file

Jakub Narebski committed over 15 years ago

sh-18n: quell "unused variable" warning

Michael J Gruber committed over 15 years ago

init/clone: remove short option -L and document --separate-git-dir

Nguyen Thai Ngoc Duy committed over 15 years ago

handle_options(): do not miscount how many arguments were used

Junio C Hamano committed over 15 years ago

config: always parse GIT_CONFIG_PARAMETERS during git_config

Jeff King committed over 15 years ago

git_config: don't peek at global config_parameters

Jeff King committed over 15 years ago

config: make environment parsing routines static

Jeff King committed over 15 years ago

doc: discuss textconv versus external diff drivers

Jeff King committed over 15 years ago

checkout: make advice when reattaching the HEAD less loud

Junio C Hamano committed over 15 years ago

require-work-tree wants more than what its name says

Junio C Hamano committed over 15 years ago

gitweb: Make JavaScript ability to adjust timezones configurable

Jakub Narebski committed over 15 years ago

gitweb.js: Add UI for selecting common timezone to display dates

John 'Warthog9' Hawley committed over 15 years ago

gitweb: JavaScript ability to adjust time based on timezone

John 'Warthog9' Hawley committed over 15 years ago

gitweb: Unify the way long timestamp is displayed

Jakub Narebski committed over 15 years ago