Merge branch 'maint'

Junio C Hamano committed over 16 years ago

Merge branch 'maint-1.6.6' into maint

Junio C Hamano committed over 16 years ago

gitweb: Die if there are parsing errors in config file

Jakub Narebski committed over 16 years ago

git svn: Fix launching of pager

Jonathan Nieder committed over 16 years ago

git.1: Clarify the behavior of the --paginate option

Jonathan Nieder committed over 16 years ago

Make 'git var GIT_PAGER' always print the configured pager

Jonathan Nieder committed over 16 years ago

Fix 'git var' usage synopsis

Jonathan Nieder committed over 16 years ago

init-db, rev-parse --git-dir: do not append redundant slash

Nguyễn Thái Ngọc Duy committed over 16 years ago

make_absolute_path(): Do not append redundant slash

Nguyễn Thái Ngọc Duy committed over 16 years ago

fix minor memory leak in get_tree_entry()

René Scharfe committed over 16 years ago

builtin-notes: Add "copy" subcommand for copying notes between objects

Johan Herland committed over 16 years ago

builtin-notes: Misc. refactoring of argc and exit value handling

Johan Herland committed over 16 years ago

builtin-notes: Add -c/-C options for reusing notes

Johan Herland committed over 16 years ago

builtin-notes: Refactor handling of -F option to allow combining -m and -F

Johan Herland committed over 16 years ago

builtin-notes: Deprecate the -m/-F options for "git notes edit"

Johan Herland committed over 16 years ago

builtin-notes: Add "append" subcommand for appending to note objects

Johan Herland committed over 16 years ago

builtin-notes: Add "add" subcommand for adding notes to objects

Johan Herland committed over 16 years ago

builtin-notes: Add --message/--file aliases for -m/-F options

Johan Herland committed over 16 years ago

builtin-notes: Add "list" subcommand for listing note objects

Johan Herland committed over 16 years ago

Documentation: Generalize git-notes docs to 'objects' instead of 'commits'

Johan Herland committed over 16 years ago