pull: colorize the hint about setting `pull.rebase`

Johannes Schindelin committed almost 6 years ago

t4015: let the test pass with any default branch name

Johannes Schindelin committed almost 6 years ago

t1309: use a neutral branch name in the `onbranch` test cases

Johannes Schindelin committed almost 6 years ago

gc: fix cast in compare_tasks_by_selection()

René Scharfe committed almost 6 years ago

Sixth batch

Junio C Hamano committed almost 6 years ago

Merge branch 'jc/blame-ignore-fix'

Junio C Hamano committed almost 6 years ago

Merge branch 'jc/sparse-error-for-developer-build'

Junio C Hamano committed almost 6 years ago

Merge branch 'pb/blame-funcname-range-userdiff'

Junio C Hamano committed almost 6 years ago

Merge branch 'en/merge-ort-api-null-impl'

Junio C Hamano committed almost 6 years ago

Merge branch 'ds/maintenance-part-3'

Junio C Hamano committed almost 6 years ago

Merge branch 'pw/rebase-i-orig-head'

Junio C Hamano committed almost 6 years ago

Merge branch 'rs/archive-high-compression'

Junio C Hamano committed almost 6 years ago

Merge branch 'dg/bswap-msvc'

Junio C Hamano committed almost 6 years ago

Merge branch 'jk/format-patch-output'

Junio C Hamano committed almost 6 years ago

Merge branch 'jc/line-log-takes-no-pathspec'

Junio C Hamano committed almost 6 years ago

Merge branch 'rs/empty-reflog-check-fix'

Junio C Hamano committed almost 6 years ago

Merge branch 'nk/perf-fsmonitor'

Junio C Hamano committed almost 6 years ago

Merge branch 'en/merge-tests'

Junio C Hamano committed almost 6 years ago

Merge branch 'js/default-branch-name-adjust-t5515'

Junio C Hamano committed almost 6 years ago

Merge branch 'dd/upload-pack-stateless-eof'

Junio C Hamano committed almost 6 years ago