Merge "checkout ambiguous ref bugfix" into maint

Junio C Hamano committed over 15 years ago

"log --cherry-pick" documentation regression fix

Junio C Hamano committed over 15 years ago

revisions.txt: structure with a labelled list

Michael J Gruber committed over 15 years ago

revisions.txt: consistent use of quotes

Michael J Gruber committed over 15 years ago

reflog: fix overriding of command line options

Michael J Gruber committed over 15 years ago

t/t1411: test reflog with formats

Michael J Gruber committed over 15 years ago

builtin/log.c: separate default and setup of cmd_log_init()

Michael J Gruber committed over 15 years ago

git-svn: add an option to skip the creation of empty directories

Michael Haggerty committed over 15 years ago

docs: fix filter-branch subdir example for exotic repo names

Jeff King committed over 15 years ago

clean: unreadable directory may still be rmdir-able if it is empty

Alex Riesen committed over 15 years ago

Git 1.7.5-rc0

Junio C Hamano committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

parse-remote: typofix

Junio C Hamano committed over 15 years ago

submodule: process conflicting submodules only once

Nicolas Morey-Chaisemartin committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

remote: deprecate --mirror

Jeff King committed over 15 years ago

remote: separate the concept of push and fetch mirrors

Jeff King committed over 15 years ago

remote: disallow some nonsensical option combinations

Jeff King committed over 15 years ago

grep: allow -E and -n to be turned on by default via configuration

Joe Ratterman committed over 15 years ago

Make "git notes add" more user-friendly when there are existing notes

Johan Herland committed over 15 years ago