Merge branch 'rs/combine-diff-zero-context-at-the-beginning'

Junio C Hamano committed over 14 years ago

Merge branch 'jk/diff-no-rename-empty'

Junio C Hamano committed over 14 years ago

Merge branch 'jc/maint-clean-nested-worktree-in-subdir'

Junio C Hamano committed over 14 years ago

Merge branch 'rs/unpack-trees-leakfix'

Junio C Hamano committed over 14 years ago

Merge branch 'nl/rebase-i-cheat-sheet'

Junio C Hamano committed over 14 years ago

t4052: Adjust --graph --stat output for prefixes

Lucian Poston committed over 14 years ago

Adjust stat width calculations to take --graph output into account

Lucian Poston committed over 14 years ago

Add output_prefix_length to diff_options

Lucian Poston committed over 14 years ago

t4052: test --stat output with --graph

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

diff: avoid stack-buffer-read-overrun for very long name

Jim Meyering committed over 14 years ago

RelNotes: the first batch of topics graduated to 'master'

Junio C Hamano committed over 14 years ago

Merge branch 'da/difftool-test'

Junio C Hamano committed over 14 years ago

Merge branch 'zj/test-cred-helper-nicer-prove'

Junio C Hamano committed over 14 years ago

Merge branch 'jh/notes-merge-in-git-dir-worktree'

Junio C Hamano committed over 14 years ago

Merge branch 'tr/maint-word-diff-regex-sticky'

Junio C Hamano committed over 14 years ago

Merge branch 'jn/diffstat-tests'

Junio C Hamano committed over 14 years ago

Merge branch 'jc/diff-algo-cleanup'

Junio C Hamano committed over 14 years ago

Merge branch 'jc/commit-hook-authorship'

Junio C Hamano committed over 14 years ago

Merge branch 'nd/stream-more'

Junio C Hamano committed over 14 years ago

merge overwrites unstaged changes in renamed file

Clemens Buchacher committed over 14 years ago