Jameson Miller 18a869b96b Merge 'builtin-stash-rebase-v3' ...

This trick was performed by rebasing the builtin-stash-rebase-v2 branch
thicket via `git rebase -ki --rebase-merges=rebase-cousins v2.19.1`,
replacing all branches that made it into `pu` by their current versions
(and also the builtin-stash by the newest iteration as of ungps/git),
labeling the branch as `builtin-stash-rebase-v3` and then replacing it
in the `merge` command in the todo list.

We did have to rebase the "cousins" because the initial merge of a
merging-rebase will confuse the merge-base logic (and hence the changes
would be dropped when we try to merge them "again").

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

2018-10-04 21:52:25 +02:00

..

add.c

add --edit: truncate the patch file

2018-10-04 21:34:22 +02:00

am.c

Merge branch 'en/directory-renames-nothanks'

2018-09-04 14:31:38 -07:00

annotate.c

…

apply.c

apply.c: make init_apply_state() take a struct repository

2018-08-13 14:14:44 -07:00

archive.c

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

2018-10-04 21:34:18 +02:00

bisect--helper.c

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

2018-10-04 21:34:18 +02:00

blame.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

branch.c

branch: support configuring --sort via .gitconfig

2018-08-16 11:17:10 -07:00

bundle.c

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

2018-10-04 21:34:18 +02:00

cat-file.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

check-attr.c

attr: remove index from git_attr_set_direction()

2018-08-13 14:14:43 -07:00

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

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

2018-10-04 21:34:18 +02:00

checkout-index.c

Merge branch 'rs/opt-updates'

2018-08-27 14:33:43 -07:00

checkout.c

checkout.c: enable fscache for checkout again

2018-10-04 21:34:23 +02:00

clean.c

Merge branch 'clean-long-paths'

2018-10-04 21:33:59 +02:00

clone.c

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

2018-10-04 21:34:18 +02:00

column.c

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

2018-10-04 21:34:18 +02:00

commit-graph.c

commit-graph: add free_commit_graph

2018-07-17 15:47:48 -07:00

commit-tree.c

commit: add repository argument to lookup_commit

2018-06-29 10:43:39 -07:00

commit.c

status: reinstate --show-ignored-directory as a deprecated option

2018-10-04 21:34:16 +02:00

config.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

count-objects.c

packfile: convert has_sha1_pack to object_id

2018-05-02 13:59:49 +09:00

credential.c

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

2018-10-04 21:34:18 +02:00

describe.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

diff.c: move read_index() code back to the caller

2018-08-13 14:14:42 -07:00

diff.c

tag: add repository argument to deref_tag

2018-06-29 10:43:39 -07:00

difftool.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

fast-export.c

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

2018-10-04 20:54:57 +02:00

fetch-pack.c

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

2018-10-04 21:34:18 +02:00

fetch.c

Merge branch 'jt/connectivity-check-after-unshallow'

2018-08-15 15:08:28 -07:00

fmt-merge-msg.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

for-each-ref.c

…

fsck.c

Merge branch 'jk/core-use-replace-refs'

2018-08-15 15:08:23 -07:00

gc.c

gc/repack: release packs when needed

2018-10-04 20:55:04 +02:00

get-tar-commit-id.c

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

2018-10-04 21:34:18 +02:00

grep.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

hash-object.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

help.c

Merge branch 'nd/command-list'

2018-06-01 15:06:37 +09:00

index-pack.c

Merge branch 'jk/core-use-replace-refs'

2018-08-15 15:08:23 -07:00

init-db.c

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

2018-10-04 20:55:05 +02:00

interpret-trailers.c

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

2018-10-04 21:34:18 +02:00

log.c

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

2018-10-04 21:34:18 +02:00

ls-files.c

ls-files: correct index argument to get_convert_attr_ascii()

2018-08-13 14:14:43 -07:00

ls-remote.c

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

2018-10-04 21:34:18 +02:00

ls-tree.c

object-store: move object access functions to object-store.h

2018-05-16 11:42:03 +09:00

mailinfo.c

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

2018-10-04 21:34:18 +02:00

mailsplit.c

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

2018-10-04 21:34:18 +02:00

merge-base.c

merge-base --fork-point: extract libified function

2018-10-04 20:46:17 +02:00

merge-file.c

…

merge-index.c

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

2018-10-04 21:34:18 +02:00

merge-ours.c

…

merge-recursive.c

builtin/merge-recursive: make hash independent

2018-07-16 14:27:39 -07:00

merge-tree.c

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

2018-10-04 21:34:18 +02:00

merge.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

mktag.c

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

2018-10-04 21:34:18 +02:00

mktree.c

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

2018-10-04 21:34:18 +02:00

mv.c

Merge branch 'ma/lockfile-cleanup'

2018-05-30 14:04:05 +09:00

name-rev.c

tag: add repository argument to deref_tag

2018-06-29 10:43:39 -07:00

notes.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

pack-objects.c

Merge branch 'nd/pack-deltify-regression-fix'

2018-08-22 11:17:05 -07:00

pack-redundant.c

pack-redundant: convert linked lists to use struct object_id

2018-05-02 13:59:50 +09:00

pack-refs.c

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

2018-10-04 21:34:18 +02:00

patch-id.c

…

prune-packed.c

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

2018-10-04 21:34:18 +02:00

prune.c

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

2018-10-04 21:34:18 +02:00

pull.c

Merge branch 'rs/opt-updates'

2018-08-27 14:33:43 -07:00

push.c

Merge branch 'rs/opt-updates'

2018-08-27 14:33:43 -07:00

range-diff.c

range-diff: update stale summary of --no-dual-color

2018-08-27 13:13:59 -07:00

read-tree.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

rebase--interactive.c

non-builtin rebase: use non-builtin interactive backend

2018-10-04 20:47:42 +02:00

rebase.c

stash/rebase: default to the non-builtin versions

2018-10-04 20:47:43 +02:00

receive-pack.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

reflog.c

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

2018-10-04 21:34:18 +02:00

remote-ext.c

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

2018-10-04 21:34:18 +02:00

remote-fd.c

…

remote.c

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

2018-10-04 21:34:18 +02:00

repack.c

gc/repack: release packs when needed

2018-10-04 20:55:04 +02:00

replace.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

rerere.c

…

reset.c

reset: support the experimental --stdin option

2018-10-04 20:55:05 +02:00

rev-list.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

rev-parse.c

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

2018-10-04 21:34:18 +02:00

revert.c

Merge branch 'nd/cherry-pick-quit-fix'

2018-08-20 12:41:34 -07:00

rm.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

send-pack.c

Merge branch 'rs/opt-updates'

2018-08-27 14:33:43 -07:00

serve.c

…

shortlog.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

show-branch.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

show-index.c

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

2018-10-04 21:34:18 +02:00

show-ref.c

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

2018-10-04 21:34:18 +02:00

stash.c

stash/rebase: default to the non-builtin versions

2018-10-04 20:47:43 +02:00

stripspace.c

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

2018-10-04 21:34:18 +02:00

submodule--helper.c

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

2018-10-04 21:34:18 +02:00

symbolic-ref.c

…

tag.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

unpack-file.c

object-store: move object access functions to object-store.h

2018-05-16 11:42:03 +09:00

unpack-objects.c

Merge branch 'jk/core-use-replace-refs'

2018-08-15 15:08:23 -07:00

update-index.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

update-ref.c

update-ref --stdin: use skip_prefix()

2018-06-04 12:26:01 +09:00

update-server-info.c

…

upload-archive.c

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

2018-10-04 21:34:18 +02:00

upload-pack.c

check_replace_refs: rename to read_replace_refs

2018-07-18 15:45:14 -07:00

var.c

…

verify-commit.c

commit: add repository argument to lookup_commit

2018-06-29 10:43:39 -07:00

verify-pack.c

…

verify-tag.c

ref-filter: use "struct object_id" consistently

2018-04-09 06:14:45 +09:00

worktree.c

worktree: add --quiet option

2018-08-17 15:18:01 -07:00

write-tree.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00