Merge branch 'mh/maint-http-proxy-fix'

Junio C Hamano committed over 18 years ago

Merge branch 'cb/http-test'

Junio C Hamano committed over 18 years ago

Merge branch 'jc/remote-multi-url'

Junio C Hamano committed over 18 years ago

Merge branch 'jn/gitweb-grep'

Junio C Hamano committed over 18 years ago

gitk: Fix problems with target row stuff

Paul Mackerras committed over 18 years ago

Merge branch 'mk/maint-parse-careful'

Junio C Hamano committed over 18 years ago

Merge branch 'sb/describe-long'

Junio C Hamano committed over 18 years ago

Merge branch 'ew/maint-svn-cert-fileprovider'

Junio C Hamano committed over 18 years ago

Merge branch 'js/maint-daemon'

Junio C Hamano committed over 18 years ago

parse-options: new option type to treat an option-like parameter as an argument.

Pierre Habouzit committed over 18 years ago

parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt

Pierre Habouzit committed over 18 years ago

Documentation: Remove --{min,max}-age option from git-log(1)

Jakub Narebski committed over 18 years ago

cleanup: remove unused git_checkout_config

Denis Cheng committed over 18 years ago

Fix make_absolute_path() for parameters without a slash

Johannes Schindelin committed over 18 years ago

diff: make sure work tree side is shown as 0{40} when different

Junio C Hamano committed over 18 years ago

diff-lib.c: constness strengthening

Junio C Hamano committed over 18 years ago

Clean up find_unique_abbrev() callers

Junio C Hamano committed over 18 years ago

find_unique_abbrev(): redefine semantics

Junio C Hamano committed over 18 years ago

git rebase --abort: always restore the right commit

Mike Hommey committed over 18 years ago

Documentation/git-rebase.txt: Add --strategy to synopsys

Mike Hommey committed over 18 years ago