Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

branch -d: base the "already-merged" safety on the branch it merges with

Junio C Hamano committed almost 17 years ago

Merge branch 'maint-1.6.1' into maint

Junio C Hamano committed almost 17 years ago

textconv: stop leaking file descriptors

Jeff King committed almost 17 years ago

reset: add a few tests for "git reset --merge"

Christian Couder committed almost 17 years ago

Documentation: reset: add some tables to describe the different options

Christian Couder committed almost 17 years ago

reset: improve mixed reset error message when in a bare repo

Christian Couder committed almost 17 years ago

reset: unbreak hard resets with GIT_WORK_TREE

Jeff King committed almost 17 years ago

archive: complain about path specs that don't match anything

René Scharfe committed almost 17 years ago

Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed almost 17 years ago

commit: --cleanup is a message option

Greg Price committed almost 17 years ago

git count-objects: handle packs bigger than 4G

Andreas Schwab committed almost 17 years ago

t7102: make the test fail if one of its check fails

Nguyễn Thái Ngọc Duy committed almost 17 years ago

Remove http.authAny

Junio C Hamano committed almost 17 years ago

Documentation: always respect core.worktree if set

Nguyễn Thái Ngọc Duy committed almost 17 years ago

clone: use --progress to force progress reporting

Tay Ray Chuan committed almost 17 years ago

clone: set transport->verbose when -v/--verbose is used

Tay Ray Chuan committed almost 17 years ago

git-clone.txt: reword description of progress behaviour

Tay Ray Chuan committed almost 17 years ago

check stderr with isatty() instead of stdout when deciding to show progress

Tay Ray Chuan committed almost 17 years ago

Remove special casing of http, https and ftp

Ilari Liusvaara committed almost 17 years ago