Merge branch 'bk/sob-dco'

Junio C Hamano committed almost 6 years ago

Merge branch 'ds/maintenance-commit-graph-auto-fix'

Junio C Hamano committed almost 6 years ago

Merge branch 'ds/commit-graph-merging-fix'

Junio C Hamano committed almost 6 years ago

Merge branch 'es/test-cmp-typocatcher'

Junio C Hamano committed almost 6 years ago

Merge branch 'jk/fast-import-marks-alloc-fix'

Junio C Hamano committed almost 6 years ago

Merge branch 'js/avoid-split-sideband-message'

Junio C Hamano committed almost 6 years ago

strmap: new utility functions

Elijah Newren committed almost 6 years ago

hashmap: provide deallocation function names

Elijah Newren committed almost 6 years ago

hashmap: introduce a new hashmap_partial_clear()

Elijah Newren committed almost 6 years ago

hashmap: allow re-use after hashmap_free()

Elijah Newren committed almost 6 years ago

hashmap: adjust spacing to fix argument alignment

Elijah Newren committed almost 6 years ago

git-prompt.sh: localize `option` in __git_ps1_show_upstream

Sibo Dong committed almost 6 years ago

blame: simplify 'setup_blame_bloom_data' interface

Philippe Blain committed almost 6 years ago

blame: simplify 'setup_scoreboard' interface

Philippe Blain committed almost 6 years ago

blame: enable funcname blaming with userdiff driver

Philippe Blain committed almost 6 years ago

line-log: mention both modes in 'blame' and 'log' short help

Philippe Blain committed almost 6 years ago

doc: add more pointers to gitattributes(5) for userdiff

Philippe Blain committed almost 6 years ago

blame-options.txt: also mention 'funcname' in '-L' description

Philippe Blain committed almost 6 years ago

doc: line-range: improve formatting

Philippe Blain committed almost 6 years ago

doc: log, gitk: move '-L' description to 'line-range-options.txt'

Philippe Blain committed almost 6 years ago