git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-30 00:43:38 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
ebcd5deeeeb12f69a35e89f9b14fe7dcf9158c98
git/builtin
History
Jameson Miller b8ad3e7af6 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>
2019-02-20 12:44:07 +01:00
..
add.c
Merge pull request #1914 from benpeart/free-fscache-after-add-gfw
2019-02-20 12:44:04 +01:00
am.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
annotate.c
…
apply.c
…
archive.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
bisect--helper.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
blame.c
Merge branch 'lt/date-human'
2019-02-06 22:05:24 -08: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*
2019-02-20 12:43:45 +01:00
cat-file.c
Merge branch 'jk/loose-object-cache-oid'
2019-02-06 22:05:27 -08:00
check-attr.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
check-ignore.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
check-mailmap.c
…
check-ref-format.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
checkout-index.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
checkout.c
fscache: fscache takes an initial size
2019-02-20 12:43:48 +01:00
clean.c
Merge branch 'clean-long-paths'
2019-02-20 12:44:01 +01:00
clone.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
column.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
commit-graph.c
commit-graph: rename "large edges" to "extra edges"
2019-01-22 11:33:46 -08:00
commit-tree.c
commit-tree: add missing --gpg-sign flag
2019-01-22 11:08:35 -08:00
commit.c
fscache: fscache takes an initial size
2019-02-20 12:43:48 +01:00
config.c
Merge branch 'jk/save-getenv-result'
2019-01-29 12:47:54 -08:00
count-objects.c
rename "alternate_object_database" to "object_directory"
2018-11-13 14:22:02 +09:00
credential.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
describe.c
Merge branch 'ss/describe-dirty-in-the-right-directory'
2019-02-06 22:05:29 -08:00
diff-files.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff-index.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff.c
Merge branch 'sl/const'
2019-02-06 22:05:28 -08:00
difftool.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
fast-export.c
Merge branch 'en/fast-export-import'
2019-01-04 13:33:33 -08:00
fetch-pack.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
fetch.c
Fix typos in translatable strings for v2.21.0
2019-02-11 12:58:06 -08:00
fmt-merge-msg.c
…
for-each-ref.c
…
fsck.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
gc.c
Merge branch 'js/gc-repack-close-before-remove'
2019-01-18 13:49:57 -08:00
get-tar-commit-id.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
grep.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
hash-object.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
help.c
…
index-pack.c
convert has_sha1_file() callers to has_object_file()
2019-01-08 09:41:06 -08:00
init-db.c
mingw: respect core.hidedotfiles = false in git-init again
2019-02-20 12:43:22 +01:00
interpret-trailers.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
log.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
ls-files.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
ls-remote.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
ls-tree.c
Merge branch 'nd/attr-pathspec-in-tree-walk'
2019-01-14 15:29:28 -08:00
mailinfo.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
mailsplit.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +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*
2019-02-20 12:43:45 +01:00
merge-ours.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
merge-recursive.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
merge-tree.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
merge.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
mktag.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
mktree.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
multi-pack-index.c
…
mv.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
name-rev.c
…
notes.c
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
2019-01-15 15:38:29 -08:00
pack-objects.c
Merge branch 'sl/const'
2019-02-06 22:05:28 -08:00
pack-redundant.c
various: tighten constness of some local variables
2019-02-04 09:57:10 -08:00
pack-refs.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
patch-id.c
…
prune-packed.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
prune.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
pull.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
push.c
Merge branch 'nd/style-opening-brace'
2019-01-18 13:49:52 -08:00
range-diff.c
…
read-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
rebase--interactive.c
non-builtin rebase: use non-builtin interactive backend
2019-02-20 12:43:58 +01:00
rebase.c
Fix typos in translatable strings for v2.21.0
2019-02-11 12:58:06 -08:00
receive-pack.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
reflog.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
remote-ext.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
remote-fd.c
…
remote.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
repack.c
gc/repack: release packs when needed
2019-02-20 12:43:24 +01:00
replace.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
rerere.c
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
2019-01-15 15:38:29 -08:00
reset.c
reset: support the experimental --stdin option
2019-02-20 12:43:22 +01:00
rev-list.c
Merge branch 'ds/push-sparse-tree-walk'
2019-02-06 22:05:25 -08:00
rev-parse.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
revert.c
Merge branch 'nd/the-index'
2019-01-04 13:33:33 -08:00
rm.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
send-pack.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
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*
2019-02-20 12:43:45 +01:00
show-ref.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
stash.c
stash: fix segmentation fault when files were added with intent
2019-02-20 12:43:57 +01:00
stripspace.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
submodule--helper.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +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
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
update-ref.c
…
update-server-info.c
…
upload-archive.c
mingw: ensure that core.longPaths is handled *always*
2019-02-20 12:43:45 +01:00
upload-pack.c
…
var.c
…
verify-commit.c
…
verify-pack.c
…
verify-tag.c
…
worktree.c
worktree: allow to (re)move worktrees with uninitialized submodules
2019-01-07 09:26:33 -08:00
write-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00