Merge branch 'ak/submodule-sync'

Junio C Hamano committed almost 16 years ago

Merge branch 'jk/maint-rev-list-nul'

Junio C Hamano committed almost 16 years ago

Merge branch 'ks/no-textconv-symlink'

Junio C Hamano committed almost 16 years ago

Merge branch 'jn/gitweb-test'

Junio C Hamano committed almost 16 years ago

Merge branch 'cb/diff-fname-optim'

Junio C Hamano committed almost 16 years ago

Merge branch 'jk/no-textconv-symlink'

Junio C Hamano committed almost 16 years ago

Merge branch 'dk/maint-blame-el'

Junio C Hamano committed almost 16 years ago

Merge branch 'maint'

Junio C Hamano committed almost 16 years ago

t6022: Use -eq not = to test output of wc -l

Brian Gernhardt committed almost 16 years ago

clean: remove redundant variable baselen

Nguyễn Thái Ngọc Duy committed almost 16 years ago

Provide 'git merge --abort' as a synonym to 'git reset --merge'

Johan Herland committed almost 16 years ago

cmd_merge(): Parse options before checking MERGE_HEAD

Johan Herland committed almost 16 years ago

Provide 'git notes get-ref' to easily retrieve current notes ref

Johan Herland committed almost 16 years ago

git notes merge: Add testcases for merging notes trees at different fanouts

Johan Herland committed almost 16 years ago

git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"

Johan Herland committed almost 16 years ago

git notes merge: --commit should fail if underlying notes ref has moved

Johan Herland committed almost 16 years ago

git notes merge: List conflicting notes in notes merge commit message

Johan Herland committed almost 16 years ago

git notes merge: Manual conflict resolution, part 2/2

Johan Herland committed almost 16 years ago

git notes merge: Manual conflict resolution, part 1/2

Johan Herland committed almost 16 years ago

Documentation: Preliminary docs on 'git notes merge'

Johan Herland committed almost 16 years ago