Jameson Miller 1a331ddd67 Merge 'builtin-stash-rebase-v3' ...

To avoid having to play tricks as in earlier rounds, we bit the sour
apple and rebased the `builtin-stash-rebase-v3` branch thicket onto the
commit starting Git for Windows' merging-rebase.

(The merging-rebase pulls in the previous branch thicket via a "fake
merge", i.e. a merge commit that does not actually apply any changes
from the merged commit history. This has the unfortunate side effect of
confusing `merge` into thinking that any branch that was merged into an
earlier round does not need to be merged again.)

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

2018-12-15 08:38:31 +01:00

..

add.c

add: use preload-index and fscache for performance

2018-12-15 08:35:17 +01:00

am.c

Merge branch 'jk/unused-parameter-fixes'

2018-11-18 18:23:53 +09:00

annotate.c

…

apply.c

…

archive.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

bisect--helper.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

blame.c

Merge branch 'nd/show-gitcomp-compilation-fix' into maint

2018-12-15 12:24:33 +09:00

branch.c

Merge branch 'tq/branch-style-fix' into maint

2018-11-21 22:58:06 +09:00

bundle.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

cat-file.c

Merge branch 'tb/print-size-t-with-uintmax-format'

2018-11-19 16:24:41 +09:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

checkout-index.c

assert NOARG/NONEG behavior of parse-options callbacks

2018-11-06 12:56:29 +09:00

checkout.c

checkout.c: enable fscache for checkout again

2018-12-15 08:35:18 +01:00

clean.c

Merge branch 'clean-long-paths'

2018-12-15 08:38:26 +01:00

clone.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

column.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

commit-graph.c

Merge branch 'ds/commit-graph-leakfix'

2018-10-19 13:34:07 +09:00

commit-tree.c

…

commit.c

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

2018-12-15 08:38:28 +01:00

config.c

worktree: add per-worktree config files

2018-10-22 13:17:04 +09:00

count-objects.c

…

credential.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

describe.c

refresh_index: remove unnecessary calls to preload_index()

2018-11-06 12:49:59 +09:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

difftool.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

fast-export.c

fast-export: do not refer to non-existing marks

2018-12-15 08:32:44 +01:00

fetch-pack.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

fetch.c

Merge branch 'jk/unused-parameter-fixes'

2018-11-18 18:23:53 +09:00

fmt-merge-msg.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

for-each-ref.c

…

fsck.c

Merge branch 'nd/per-worktree-ref-iteration'

2018-11-13 22:37:26 +09:00

gc.c

gc/repack: release packs when needed

2018-12-15 08:32:46 +01:00

get-tar-commit-id.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

grep.c

Merge branch 'jk/unused-parameter-fixes'

2018-11-18 18:23:53 +09:00

hash-object.c

…

help.c

Merge branch 'rv/alias-help'

2018-10-26 14:22:13 +09:00

index-pack.c

Merge branch 'tb/print-size-t-with-uintmax-format'

2018-11-19 16:24:41 +09:00

init-db.c

mingw: respect core.hidedotfiles = false in git-init again

2018-12-15 08:32:43 +01:00

interpret-trailers.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

log.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

ls-files.c

assert NOARG/NONEG behavior of parse-options callbacks

2018-11-06 12:56:29 +09:00

ls-remote.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

ls-tree.c

Upcast size_t variables to uintmax_t when printing

2018-11-12 16:43:52 +09:00

mailinfo.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

mailsplit.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

merge-base.c

Merge branch 'pk/rebase-in-c-4-opts'

2018-11-02 11:04:55 +09:00

merge-file.c

assert NOARG/NONEG behavior of parse-options callbacks

2018-11-06 12:56:29 +09:00

merge-index.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

merge.c

Merge branch 'jk/verify-sig-merge-into-void'

2018-11-18 18:23:54 +09:00

mktag.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

mktree.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'cb/notes-freeing-always-null-fix'

2018-11-18 18:23:57 +09:00

pack-objects.c

Merge branch 'tb/void-check-attr' into maint

2018-11-21 22:57:54 +09:00

pack-redundant.c

…

pack-refs.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

patch-id.c

…

prune-packed.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

prune.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

pull.c

Merge branch 'jk/verify-sig-merge-into-void'

2018-11-18 18:23:54 +09:00

push.c

push: change needlessly ambiguous example in error

2018-11-14 17:17:09 +09:00

range-diff.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

read-tree.c

assert NOARG/NONEG behavior of parse-options callbacks

2018-11-06 12:56:29 +09:00

rebase--interactive.c

non-builtin rebase: use non-builtin interactive backend

2018-12-15 08:38:22 +01:00

rebase.c

builtin rebase: call git am directly

2018-12-15 08:38:21 +01:00

receive-pack.c

Merge branch 'jk/check-everything-connected-is-long-gone' into maint

2018-11-21 22:58:00 +09:00

reflog.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

remote-ext.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

remote-fd.c

…

remote.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

repack.c

gc/repack: release packs when needed

2018-12-15 08:32:46 +01:00

replace.c

Merge branch 'ab/replace-graft-with-replace-advice'

2018-12-01 21:41:42 +09:00

rerere.c

Merge branch 'jk/xdiff-interface'

2018-11-13 22:37:27 +09:00

reset.c

reset: support the experimental --stdin option

2018-12-15 08:32:43 +01:00

rev-list.c

Merge branch 'md/exclude-promisor-objects-fix' into maint

2018-11-21 22:57:52 +09:00

rev-parse.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

revert.c

…

rm.c

…

send-pack.c

…

serve.c

…

shortlog.c

Merge branch 'nd/show-gitcomp-compilation-fix' into maint

2018-12-15 12:24:33 +09:00

show-branch.c

assert NOARG/NONEG behavior of parse-options callbacks

2018-11-06 12:56:29 +09:00

show-index.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

show-ref.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

stash.c

stash: optionally use the scripted version again

2018-12-15 08:38:21 +01:00

stripspace.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

submodule--helper.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

symbolic-ref.c

…

tag.c

assert NOARG/NONEG behavior of parse-options callbacks

2018-11-06 12:56:29 +09:00

unpack-file.c

…

unpack-objects.c

…

update-index.c

Merge branch 'nd/show-gitcomp-compilation-fix' into maint

2018-12-15 12:24:33 +09:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

mingw: ensure that core.longPaths is handled *always*

2018-12-15 08:35:17 +01:00

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

worktree: rename is_worktree_locked to worktree_lock_reason

2018-10-31 11:41:47 +09:00

write-tree.c

…