Merge branch 'mm/config-path'

Junio C Hamano committed almost 17 years ago

Merge branch 'pm/cvs-environ'

Junio C Hamano committed almost 17 years ago

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes'

Junio C Hamano committed almost 17 years ago

Merge branch 'bg/maint-remote-update-default'

Junio C Hamano committed almost 17 years ago

Merge branch 'mm/diag-path-in-treeish'

Junio C Hamano committed almost 17 years ago

Merge branch 'fc/opt-quiet-gc-reset'

Junio C Hamano committed almost 17 years ago

Documentation: show-files is now called git-ls-files

Thomas Rast committed almost 17 years ago

Documentation: tiny git config manual tweaks

Jonathan Nieder committed almost 17 years ago

Documentation: git gc packs refs by default now

Jonathan Nieder committed almost 17 years ago

fix for subtree split not finding proper base for new commits

Jakub Suder committed almost 17 years ago

allow using --branch with existing branches if it makes sense

Jakub Suder committed almost 17 years ago

added -m/--message option for setting merge commit message

Jakub Suder committed almost 17 years ago

Documentation: spell 'git cmd' without dash throughout

Thomas Rast committed almost 17 years ago

Documentation: format full commands in typewriter font

Thomas Rast committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Merge branch 'maint-1.6.2' into maint

Junio C Hamano committed almost 17 years ago

Merge branch 'maint-1.6.1' into maint-1.6.2

Junio C Hamano committed almost 17 years ago

Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed almost 17 years ago

daemon: consider only address in kill_some_child()

Erik Faye-Lund committed almost 17 years ago

Handle relative paths in submodule .git files

Brad King committed almost 17 years ago