mirror of
https://github.com/git-for-windows/git.git
synced 2026-03-18 16:15:22 -05:00
Start the merging-rebase to f0badda8d7
This merging-rebase does not change anything in the code, just in the commit structure of Git for Windows' branch thicket. The motivation for this is that we have accumulated tons and tons of patches in various stages of readiness to be contributed to core Git, but there is no clear picture which patches are the most ready. So here we use the calmer post-release days to organize our existing branches into a more coherent structure, reordering them in order of priority, and we also take the opportunity to merge branches (e.g. misc-vs-fixes-extra into misc-vs-fixes) as well as patches (e.g. "The stat() function should be independent of core.symlinks" really wanted to be a fixup! commit for "Win32: implement stat() with symlink support"). This commit starts the rebase off0badda8d7tof0badda8d7Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in: