Tue, 7 Jul 2020 22:01:58 +0200

Merge pull request #2733 from dscho/difftool-ita-g4w

Fix `git difftool` with intent-to-add files

Fri, 3 Jul 2020 23:09:54 +0200

Merge pull request #2731 from SyntevoAlex/#0312(win)_clone_adds_worktree

Fix problem where clone adds core.worktree due to path case differences

Fri, 3 Jul 2020 10:33:24 +0200

Merge pull request #2714 from lbonanomi/main

Rationalize line endings for scissors-cleanup

Thu, 2 Jul 2020 22:46:27 +0200

Merge pull request #2730 from dscho/crlf-aware-git-add-i

git add -i: handle CR/LF line endings in the interactive input

Thu, 18 Jun 2020 22:21:02 +0200

fixup! Mirror master and main

The workflow needs to be adjusted so that the just-pushed branch is
cloned (otherwise it is always the default branch that is cloned, even
if in the case that branch is stale).

Signed-off-by: Johannes Schindelin <[email protected]>

Tue, 16 Jun 2020 22:33:19 +0200

Mirror master and main

In preparation for eventually switching over to `main`, let's
synchronize the historical and the designated future main branch.

This follows the excellent advice from
https://github.com/chancancode/branch-rename/#gradual-migration

Signed-off-by: Johannes Schindelin <[email protected]>

Mon, 8 Jun 2020 07:36:43 +0200

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect

Sun, 7 Jun 2020 01:52:52 +0200

Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637

mingw: special-case index entries for symlinks with buggy size

Thu, 4 Jun 2020 23:50:17 +0200

Merge pull request #2665 from dscho/fix-msvc-build-g4w

msvc: fix "REG_STARTEND" issue

Mon, 1 Jun 2020 20:17:08 +0200

Merge 'readme' into HEAD

Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <[email protected]>