fix const-correctness of write_sha1_file

Jeff King committed over 16 years ago

Makefile: update defaults for modern Cygwin

Eric Blake committed over 16 years ago

Prompt for a username when an HTTP request 401s

Scott Chacon committed over 16 years ago

revert: add "--strategy" option to choose merge strategy

Christian Couder committed over 16 years ago

merge: make function try_merge_command non static

Christian Couder committed over 16 years ago

merge: refactor code that calls "git merge-STRATEGY"

Christian Couder committed over 16 years ago

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