merge-recursive: never leave index unmerged while recursing

Dave Olszewski committed over 17 years ago

Teach 'git checkout' to preload the index contents

Linus Torvalds committed over 17 years ago

Avoid unnecessary 'lstat()' calls in 'get_stat_data()'

Linus Torvalds committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

allow -t abbreviation for --track in git branch

Sitaram Chamarty committed over 17 years ago

Add --reference option to git submodule.

Michael S. Tsirkin committed over 17 years ago

add: don't complain when adding empty project root

Jeff King committed over 17 years ago

Git.pm: Always set Repository to absolute path if autodetecting

Frank Lichtenheld committed over 17 years ago

Git.pm: Set GIT_WORK_TREE if we set GIT_DIR

Frank Lichtenheld committed over 17 years ago

mergetool--lib: specialize diff options for emerge and ecmerge

David Aguilar committed over 17 years ago

format-patch let -k override a config-specified format.numbered

Jim Meyering committed over 17 years ago

fix GIT_TRACE segfault with shell-quoted aliases

Jeff King committed over 17 years ago

Disallow '\' in ref names

Robin Rosenberg committed over 17 years ago

gitweb: Remove function prototypes (cleanup)

Jakub Narebski committed over 17 years ago

Documentation: cloning to empty directory is allowed

Alexander Potashev committed over 17 years ago

Extend sample update hook, disable modifying of existing tags

Heiko Voigt committed over 17 years ago

grep: use parseopt

René Scharfe committed over 17 years ago

grep: remove global variable builtin_grep

René Scharfe committed over 17 years ago

parseopt: add PARSE_OPT_NODASH

René Scharfe committed over 17 years ago

parseopt: add OPT_NUMBER_CALLBACK

René Scharfe committed over 17 years ago