merge-trees: push choice to renormalize away from low level

Jonathan Nieder committed over 16 years ago

t6038 (merge.renormalize): check that it can be turned off

Jonathan Nieder committed over 16 years ago

t6038 (merge.renormalize): try checkout -m and cherry-pick

Jonathan Nieder committed over 16 years ago

t6038 (merge.renormalize): style nitpicks

Jonathan Nieder committed over 16 years ago

log: parse separate option for --glob

Matthieu Moy committed over 16 years ago

log: parse separate options like git log --grep foo

Matthieu Moy committed over 16 years ago

diff: parse separate options --stat-width n, --stat-name-width n

Matthieu Moy committed over 16 years ago

diff: split off a function for --stat-* option parsing

Jonathan Nieder committed over 16 years ago

diff: parse separate options like -S foo

Matthieu Moy committed over 16 years ago

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

Junio C Hamano committed over 16 years ago

pretty-options.txt: match --format's documentation with implementation.

Matthieu Moy committed over 16 years ago

instaweb: add access+error logging for WEBrick

Eric Wong committed over 16 years ago

instaweb: minimize moving parts for WEBrick

Eric Wong committed over 16 years ago

instaweb: fix WEBrick server support

Eric Wong committed over 16 years ago

git svn: URL-decode left-hand side of svn refspec

Steven Walter committed over 16 years ago

config: add --local option

Sverre Rabbelier committed over 16 years ago

setup: split off a function to handle ordinary .git directories

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

Revert "rehabilitate 'git index-pack' inside the object store"

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

setup: do not forget working dir from subdir of gitdir

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

t4111 (apply): refresh index before applying patches to it

Jonathan Nieder committed over 16 years ago