Tue, 28 Nov 2017 12:22:24 +0100

Merge pull request #1379 from atetubou/object_info_quick

fetch-pack: specify OBJECT_INFO_QUICK to remove duplicate prepare_pac…

Mon, 27 Nov 2017 21:02:29 +0100

Merge branch 'js/for-each-ref-remote-name-and-ref'

The "--format=..." option "git for-each-ref" takes learned to show
the name of the 'remote' repository and the ref at the remote side
that is affected for 'upstream' and 'push' via "%(push:remotename)"
and friends.

* js/for-each-ref-remote-name-and-ref:
  for-each-ref: test :remotename and :remoteref
  for-each-ref: let upstream/push report the remote ref name
  for-each-ref: let upstream/push optionally report the remote name

This is the final iteration that made it into upstream Git's master
branch and that started out as 8148ee40ad9 (Merge branch
'mingw/ref-filter-remote-name', 2017-10-29).

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

Sun, 26 Nov 2017 00:26:52 +0100

Merge pull request #1372 from atetubou/enable_fscache_fetch

enable fscache while iterating every local refs

Thu, 9 Nov 2017 18:32:49 +0100

prerelease-2.15.0.windows.1.11.g8ce23d0a3b

Merge pull request #1354 from dscho/phase-out-show-ignored-directory-…

Thu, 2 Nov 2017 17:57:49 +0100

fixup! status: offer *not* to lock the index and update it

This re-adds the regression test that would have found the issue before
releasing v2.15.0 *grrrr*.

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

Wed, 1 Nov 2017 23:05:16 +0100

prerelease-2.15.0.windows.1.4.gfe8b815da3

Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fs…

Tue, 31 Oct 2017 17:10:08 +0100

squash! msvc: fix `make MSVC=1 install`

Noticed by Derrick Stolee.

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

Tue, 31 Oct 2017 17:06:46 +0100

msvc: fix `make MSVC=1 install`

We used to install into $HOME/bin/, which wreaks havoc with installed
versions of Git for Windows (because $HOME/bin is *prepended* to the
PATH, hence would override `git.exe` in Git Bash).

Let's align the MSVC case with the non-MSVC case and install into
/mingw64/bin/ (or /mingw32/bin/ in 32-bit Git for Windows SDKs) instead.

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

Sun, 29 Oct 2017 16:53:00 +0100

Merge branch 'jm/status-ignored-files-list'

This is an early version of the latest iteration of what used to
be 08f088c8098 (Merge branch 'show-ignored-directory', 2017-10-23),
i.e.  support for the then-experimental, now-dropped
`--show-ignored-directory` option.

The set of paths output from "git status --ignored" was tied
closely with its "--untracked=<mode>" option, but now it can be
controlled more flexibly.  Most notably, a directory that is
ignored because it is listed to be ignored in the ignore/exclude
mechanism can be handled differently from a directory that ends up
to be ignored only because all files in it are ignored.

* jm/status-ignored-files-list:
  status: test ignored modes
  status: document options to show matching ignored files
  status: report matching ignored and normal untracked
  status: add option to show ignored files differently

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

Sat, 28 Oct 2017 17:19:39 +0200

Merge pull request #1334 from max630/mingw-direct-CreateHardLinkW

mingw: use CreateHardLink directly