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

Test update-index for a gitlink to a .git file

Brad King committed almost 17 years ago

help: fix configured help format taking over command line one

Christian Couder committed almost 17 years ago

string-list: rename the include guard to STRING_LIST_H

Thiago Farina committed almost 17 years ago

t7111: check that reset options work as described in the tables

Christian Couder committed almost 17 years ago

transport-helper.c::push_refs(): emit "no refs" error message

Tay Ray Chuan committed almost 17 years ago

transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed

Tay Ray Chuan committed almost 17 years ago

transport.c::transport_push(): make ref status affect return value

Tay Ray Chuan committed almost 17 years ago

refactor ref status logic for pushing

Tay Ray Chuan committed almost 17 years ago

t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs

Tay Ray Chuan committed almost 17 years ago

t5541-http-push.sh: add tests for non-fast-forward pushes

Tay Ray Chuan committed almost 17 years ago

base85: Make the code more obvious instead of explaining the non-obvious

Andreas Gruenbacher committed almost 17 years ago

base85: encode_85() does not use the decode table

Andreas Gruenbacher committed almost 17 years ago

base85 debug code: Fix length byte calculation

Andreas Gruenbacher committed almost 17 years ago

git-diff.txt: Link to git-difftool

David Aguilar committed almost 17 years ago

difftool: Allow specifying unconfigured commands with --extcmd

David Aguilar committed almost 17 years ago