Merge branch 'maint'

Junio C Hamano committed over 16 years ago

GIT-VERSION-GEN: restrict tags used

Tay Ray Chuan committed over 16 years ago

autocrlf: Make it work also for un-normalized repositories

Finn Arne Gangstad committed over 16 years ago

ls-remote: print URL when no repo is specified

Tay Ray Chuan committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

merge: --log appends shortlog to message if specified

Tay Ray Chuan committed over 16 years ago

fmt-merge-msg: add function to append shortlog only

Tay Ray Chuan committed over 16 years ago

fmt-merge-msg: refactor merge title formatting

Tay Ray Chuan committed over 16 years ago

fmt-merge-msg: minor refactor of fmt_merge_msg()

Tay Ray Chuan committed over 16 years ago

merge: rename variable

Tay Ray Chuan committed over 16 years ago

merge: update comment

Tay Ray Chuan committed over 16 years ago

t7604-merge-custom-message: show that --log doesn't append to -m

Tay Ray Chuan committed over 16 years ago

t7604-merge-custom-message: shift expected output creation

Tay Ray Chuan committed over 16 years ago

tests: chmod +x t5150

Jeff King committed over 16 years ago

tests: rename duplicate t4205

Jeff King committed over 16 years ago

handle "git --bare init <dir>" properly

Jeff King committed over 16 years ago

clone: reword messages to match the end-user perception

Pete Harlan committed over 16 years ago

git-svn: mangle refnames forbidden in git

Torsten Schmutzler committed over 16 years ago

git-svn: Remove unused use of File::Temp

Ævar Arnfjörð Bjarmason committed over 16 years ago

git-svn documentation: minor grammar fix

Ævar Arnfjörð Bjarmason committed over 16 years ago