Add new test case to ensure git-merge reduces octopus parents when possible

Miklos Vajna committed over 18 years ago

Introduce reduce_heads()

Junio C Hamano committed over 18 years ago

Introduce get_merge_bases_many()

Junio C Hamano committed over 18 years ago

Add new test to ensure git-merge handles more than 25 refs.

Miklos Vajna committed over 18 years ago

Introduce get_octopus_merge_bases() in commit.c

Miklos Vajna committed over 18 years ago

git-fmt-merge-msg: make it usable from other builtins

Miklos Vajna committed over 18 years ago

Move read_cache_unmerged() to read-cache.c

Miklos Vajna committed over 18 years ago

Add new test to ensure git-merge handles pull.twohead and pull.octopus

Miklos Vajna committed over 18 years ago

Move parse-options's skip_prefix() to git-compat-util.h

Miklos Vajna committed over 18 years ago

Move commit_list_count() to commit.c

Miklos Vajna committed over 18 years ago

Move split_cmdline() to alias.c

Miklos Vajna committed over 18 years ago

parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.

Pierre Habouzit committed over 18 years ago

parse-opt: fake short strings for callers to believe in.

Pierre Habouzit committed over 18 years ago

parse-opt: do not print errors on unknown options, return -2 intead.

Pierre Habouzit committed over 18 years ago

parse-opt: create parse_options_step.

Pierre Habouzit committed over 18 years ago

parse-opt: Export a non NORETURN usage dumper.

Pierre Habouzit committed over 18 years ago

parse-opt: have parse_options_{start,end}.

Pierre Habouzit committed over 18 years ago

Merge branch 'maint'

Junio C Hamano committed over 18 years ago

Add test results directory to t/.gitignore

Brian Gernhardt committed over 18 years ago

fetch: give a hint to the user when local refs fail to update

Jeff King committed over 18 years ago