summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes-1.5.0.2.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-15 19:09:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-15 19:09:46 -0700
commitfcab40a389e99786a8276108cdbc1cda8caf502f (patch)
tree7d1e037103be1644c0584c71ee9d240fc82714fc /Documentation/RelNotes-1.5.0.2.txt
parentMerge branch 'ag/rewrite_one' (diff)
parentreduce_heads(): protect from duplicate input (diff)
downloadtgif-fcab40a389e99786a8276108cdbc1cda8caf502f.tar.xz
Merge branch 'mv/merge-in-c'
* mv/merge-in-c: reduce_heads(): protect from duplicate input reduce_heads(): thinkofix Add a new test for git-merge-resolve t6021: add a new test for git-merge-resolve Teach merge.log to "git-merge" again Build in merge Fix t7601-merge-pull-config.sh on AIX git-commit-tree: make it usable from other builtins Add new test case to ensure git-merge prepends the custom merge message Add new test case to ensure git-merge reduces octopus parents when possible Introduce reduce_heads() Introduce get_merge_bases_many() Add new test to ensure git-merge handles more than 25 refs. Introduce get_octopus_merge_bases() in commit.c git-fmt-merge-msg: make it usable from other builtins Move read_cache_unmerged() to read-cache.c Add new test to ensure git-merge handles pull.twohead and pull.octopus Move parse-options's skip_prefix() to git-compat-util.h Move commit_list_count() to commit.c Move split_cmdline() to alias.c Conflicts: Makefile parse-options.c
Diffstat (limited to 'Documentation/RelNotes-1.5.0.2.txt')
0 files changed, 0 insertions, 0 deletions