Merge git://git.bogomips.org/git-svn

Junio C Hamano committed over 17 years ago

write_index(): update index_state->timestamp after flushing to disk

Kjetil Barvik committed over 17 years ago

git-p4: avoid syncing duplicate changes

Pete Wyckoff committed over 17 years ago

Add bare repository indicator for __git_ps1

Marius Storm-Olsen committed over 17 years ago

git-svn: read the dcommit url from the config file on a per remote basis

Peter Oberndorfer committed over 17 years ago

git-svn: fix delete+add branch tracking with empty files

Eric Wong committed over 17 years ago

git-svn: Create leading directories in create-ignore

Brian Gernhardt committed over 17 years ago

git config: don't allow --get-color* and variable type

Felipe Contreras committed over 17 years ago

git config: don't allow extra arguments for -e or -l.

Felipe Contreras committed over 17 years ago

git config: don't allow multiple variable types

Felipe Contreras committed over 17 years ago

git config: don't allow multiple config file locations

Felipe Contreras committed over 17 years ago

git config: reorganize to use parseopt

Felipe Contreras committed over 17 years ago

git config: reorganize get_color*

Felipe Contreras committed over 17 years ago

git config: trivial rename in preparation for parseopt

Felipe Contreras committed over 17 years ago

git_config(): not having a per-repo config file is not an error

Felipe Contreras committed over 17 years ago

git config: trivial cleanup for editor action

Johannes Schindelin committed over 17 years ago

git config: codestyle cleanups

Felipe Contreras committed over 17 years ago

format-patch: support deep threading

Thomas Rast committed over 17 years ago

format-patch: thread as reply to cover letter even with in-reply-to

Thomas Rast committed over 17 years ago

format-patch: track several references

Thomas Rast committed over 17 years ago