revert: refactor merge recursive code into its own function

Christian Couder committed over 16 years ago

revert: use strbuf to refactor the code that writes the merge message

Christian Couder committed over 16 years ago

remote-helpers: add testgit helper

Sverre Rabbelier committed over 16 years ago

remote-helpers: add support for an export command

Sverre Rabbelier committed over 16 years ago

Sync with 1.7.0.4

Junio C Hamano committed over 16 years ago

Git 1.7.0.4

Junio C Hamano committed over 16 years ago

Merge branch 'jc/maint-refs-dangling' into maint

Junio C Hamano committed over 16 years ago

Documentation: show-ref <pattern>s are optional

Holger Weiß committed over 16 years ago

Link against libiconv on IRIX

Holger Weiß committed over 16 years ago

Don't redefine htonl and ntohl on big-endian

Holger Weiß committed over 16 years ago

gitweb: git_get_project_config requires only $git_dir, not also $project

Jakub Narebski committed over 16 years ago

remote-helpers: allow requesing the path to the .git directory

Sverre Rabbelier committed over 16 years ago

fast-import: always create marks_file directories

Sverre Rabbelier committed over 16 years ago

clone: also configure url for bare clones

Sverre Rabbelier committed over 16 years ago

clone: pass the remote name to remote_get

Sverre Rabbelier committed over 16 years ago

Updated the usage string of git reset

Jan Stępień committed over 16 years ago

Documentation: Clarify support for smart HTTP backend

Greg Bacon committed over 16 years ago

Windows: fix utime() for read-only files

Johannes Sixt committed over 16 years ago

diff: fix textconv error zombies

Johannes Sixt committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago