Merge branch 'jc/utf8'

Junio C Hamano committed almost 20 years ago

core.logallrefupdates: log remotes/ tracking branches.

Junio C Hamano committed almost 20 years ago

t3900: test conversion to non UTF-8 as well

Junio C Hamano committed almost 20 years ago

Merge branch 'jc/make'

Junio C Hamano committed almost 20 years ago

xdl_merge(): fix a segmentation fault when refining conflicts

Johannes Schindelin committed almost 20 years ago

git-svn: sort multi-init output

Eric Wong committed almost 20 years ago

git-svn: verify_ref() should actually --verify

Eric Wong committed almost 20 years ago

git-svn: remove non-delta fetch code paths

Eric Wong committed almost 20 years ago

t9200-git-cvsexportcommit.sh: quiet down commit

Eric Wong committed almost 20 years ago

test-lib: quiet down init-db output for tests

Eric Wong committed almost 20 years ago

t6024-recursive-merge: quiet down this test

Eric Wong committed almost 20 years ago

Merge branch 'js/shallow'

Junio C Hamano committed almost 20 years ago

Allow git-merge to select the default strategy.

Shawn O. Pearce committed almost 20 years ago

Honor pull.{twohead,octopus} in git-merge.

Shawn O. Pearce committed almost 20 years ago

Ensure `git-pull` fails if `git-merge` fails.

Shawn O. Pearce committed almost 20 years ago

Use branch names in 'git-rebase -m' conflict hunks.

Shawn O. Pearce committed almost 20 years ago

← Newer Page 3721 of 4099 Older →