Merge branch 'sh/macos-labels'

Pratyush Yadav committed over 5 years ago

git-gui: fix colored label backgrounds when using themed widgets

Stefan Haller committed almost 6 years ago

config.mak.uname: remove old NonStop compatibility settings

Randall S. Becker committed over 5 years ago

merge-ort: implement merge_incore_recursive()

Elijah Newren committed over 5 years ago

merge-ort: make clear_internal_opts() aware of partial clearing

Elijah Newren committed over 5 years ago

merge-ort: copy a few small helper functions from merge-recursive.c

Elijah Newren committed over 5 years ago

commit: move reverse_commit_list() from merge-recursive

Elijah Newren committed over 5 years ago

pack-redundant: fix crash when one packfile in repo

Jiang Xin committed over 5 years ago

tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq

Johannes Schindelin committed over 5 years ago

t9902: use `main` as initial branch name

Johannes Schindelin committed over 5 years ago

t6302: use `main` as initial branch name

Johannes Schindelin committed over 5 years ago

t5703: use `main` as initial branch name

Johannes Schindelin committed over 5 years ago

t5510: use `main` as initial branch name

Johannes Schindelin committed over 5 years ago

t5505: finalize transitioning to using the branch name `main`

Johannes Schindelin committed over 5 years ago

t3205: finalize transitioning to using the branch name `main`

Johannes Schindelin committed over 5 years ago

t3203: complete the transition to using the branch name `main`

Johannes Schindelin committed over 5 years ago

t3201: finalize transitioning to using the branch name `main`

Johannes Schindelin committed over 5 years ago

t3200: finish transitioning to the initial branch name `main`

Johannes Schindelin committed over 5 years ago

t1400: use `main` as initial branch name

Johannes Schindelin committed over 5 years ago

diff: correct interaction between --exit-code and -I<pattern>

Junio C Hamano committed over 5 years ago