You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/backporting-upstream-git-patches.md
+4-4Lines changed: 4 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -15,13 +15,13 @@ Contributions to the upstream Git project [are only accepted in the form of patc
15
15
16
16
If the contribution was sent to the mailing list via [GitGitGadget](https://gitgitgadget.github.io/) (which is a tool allowing to send GitHub PRs to the Git mailing list without having to fiddle with mail programs until they send the contribution in the precise form that the Git project wants them), the backporting process is comparatively hassle-free: GitGitGadget contributions have a fetch'able Git branch and the PRs contain other relevant information such as the date and the commit which integrated the patches into Git's main branch.
17
17
18
-
Take for example [the "ci: use a newer `github-script` version" patch that avoids warnings in CI runs about using deprecated Actions/node.js versions](https://lore.kernel.org/git/pull.1387.git.1667902408921.gitgitgadget@gmail.com/): That mail contains the information in the footer from which PR it originated (in this example, https://github.com/gitgitgadget/git/pull/1387). That PR receives labels depending on the contribution process: `seen` if it was integrated into the daily hodgepodge branch of Git, `next` once the contribution advanced to the "let's cook this for a bit" stage, and `master` once the contribution has been slated for the next official Git version.
18
+
Take for example [the "ci: use a newer `github-script` version" patch that avoids warnings in CI runs about using deprecated Actions/node.js versions](https://lore.kernel.org/git/pull.1387.git.1667902408921.gitgitgadget@gmail.com/): That mail contains the information in the footer from which PR it originated (in this example, [`gitgitgadget/git#1387`](https://github.com/gitgitgadget/git/pull/1387)). That PR receives labels depending on the contribution process: `seen` if it was integrated into the daily hodgepodge branch of Git, `next` once the contribution advanced to the "let's cook this for a bit" stage, and `master` once the contribution has been slated for the next official Git version.
19
19
20
-
That PR also receives a comment once the patches have been integrated into a tentative topic branch, in this example ["js/ci-set-output"](https://github.com/gitgitgadget/git/pull/1387#issuecomment-1307968188). Following the [`js/ci-set-output` link](https://github.com/gitgitgadget/git/commits/js/ci-set-output), you can see the Git commits of the topic branch in which for upstream Git tracks the patches. You can also see the original shape of the contribution by clicking on the link to the PR branch at the top of the PR page (in the example: ["dscho:upgrade-github-script-version"](https://github.com/dscho/git/tree/upgrade-github-script-version)).
20
+
That PR also receives a comment once the patches have been integrated into a tentative topic branch, in this example ["js/ci-set-output"](https://github.com/gitgitgadget/git/pull/1387#issuecomment-1307968188). Following the [`js/ci-set-output` link](https://github.com/gitgitgadget/git/commits/js/ci-set-output), you can see the Git commits of the topic branch in which for upstream Git tracks the patches. You can also see the original shape of the contribution by clicking on the link to the PR branch at the top of the PR page.
21
21
22
22
When backporting patches, the Git for Windows project typically prefers the shape that was already accepted upstream, i.e. once it made it into `next`, we backport the _upstream topic branch_'s commits.
23
23
24
-
The typical way to backport such a branch is to first see whether it needs to be rebased at all, i.e. if there are any additional commits between Git for Windows' `main` branch and that topic branch. The quickest way is to direct a web browser to a URL like this: https://github.com/git-for-windows/git/compare/main...gitgitgadget:js/ci-set-output.
24
+
The typical way to backport such a branch is to first see whether it needs to be rebased at all, i.e. if there are any additional commits between Git for Windows' `main` branch and that topic branch. The quickest way is to direct a web browser to a URL like this: https://github.com/git-for-windows/git/compare/main...gitgitgadget:next (replace `gitgitgadget:next` with your own fork and branch).
25
25
26
26
### Scenario: The upstream topic branch can be used as-is
27
27
@@ -60,4 +60,4 @@ Sometimes, contributors are asked to backport patches that have made it into ups
60
60
61
61
If it is unclear what the name of that topic branch is, search for the first line of a commit message ("commit subject" or "oneline") of that contribution in the [What's cooking mail](https://github.com/git/git/blob/todo/whats-cooking.txt); The name of the topic branch will be mentioned above the line mentioning the commit subject.
62
62
63
-
If all else fails, you can also try to fetch the `seen` branch and search for the topic branch via `git show FETCH_HEAD^{/<regex>}` where the regular expression matches the commit subject in question.
63
+
If all else fails, you can also try to fetch the `seen` branch and search for the topic branch via `git show FETCH_HEAD^{/<regex>}` where the regular expression matches the commit subject in question.
Copy file name to clipboardExpand all lines: content/building-msys2-runtime.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -19,7 +19,7 @@ This last step may take a while, so please be patient!
19
19
20
20
When there are bugs in the msys2-runtime (e.g. problems with the POSIX-to-Windows path mangling), you need to rebuild the `msys-2.0.dll`, possibly frequently.
21
21
22
-
To rebuild the `msys-2.0.dll` -- assuming that you have built it already as described above -- you first need to start an *MSys* shell by double-clicking the `msys2_shell.cmd` script in your Git SDK's top-level directory. Then call `cd /usr/src/MSYS2-packages/msys2-runtime/src/msys2-runtime/winsup/cygwin`. Now you can modify the source code to your heart's content. It is actually a local clone of https://github.com/git-for-windows/msys2-runtime; you probably want to add your own fork as a remote.
22
+
To rebuild the `msys-2.0.dll` -- assuming that you have built it already as described above -- you first need to start an *MSys* shell by double-clicking the `msys2_shell.cmd` script in your Git SDK's top-level directory. Then call `cd /usr/src/MSYS2-packages/msys2-runtime/src/msys2-runtime/winsup/cygwin`. Now you can modify the source code to your heart's content. It is actually a local clone of [`git-for-windows/msys2-runtime`](https://github.com/git-for-windows/msys2-runtime); you probably want to add your own fork as a remote.
23
23
24
24
To actually build the `msys-2.0.dll`, switch to `src/build-<arch>-pc-msys/<arch>-pc-msys/winsup/cygwin` and type `make`. This will generate an `msys0.dll` file in that directory. This is the new `msys-2.0.dll`, but you cannot simply copy it into `/usr/bin/` because it is in use by the current `mintty` as well as by the current Bash. To update, you need to close all programs using the msys2-runtime (including all of the terminal windows), then copy the `msys0.dll` file, replacing the existing `/usr/bin/msys-2.0.dll`, either using Explorer, `cmd.exe` or a separate Git SDK (for example, when debugging the 64-bit msys2-runtime, a 32-bit Git SDK comes in real handy). You will **want** to make a backup copy of the old `msys-2.0.dll`...
Copy file name to clipboardExpand all lines: content/faq.md
+1-3Lines changed: 1 addition & 3 deletions
Original file line number
Diff line number
Diff line change
@@ -66,7 +66,7 @@ These often 'fix' (or attempt fixes) recent issues before a new formal release.
66
66
67
67
## What is the release cadence of Git for Windows?
68
68
69
-
Official Git for Windows versions mainly follow Git's release cycle: every 12 weeks or so, a new major Git version is released (see details here: https://tinyurl.com/gitCal). Typically, Git for Windows will follow suit within a day.
69
+
Official Git for Windows versions mainly follow Git's release cycle: every 12 weeks or so, a new major Git version is released (see details [here](https://tinyurl.com/gitCal)). Typically, Git for Windows will follow suit within a day.
70
70
71
71
Other than that, Git for Windows follows the *newest* Git version's maintenance releases (read: after Git for Windows v2.15.0 was released, no new Git for Windows v2.14.x version would be released). Indicators for imminent maintenance releases of Git are:
72
72
@@ -149,6 +149,4 @@ Reproduced from [Git for Windows' release notes](https://github.com/git-for-wind
149
149
150
150
Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.
151
151
152
-
Git for Windows also contains Embedded CAcert Root Certificates. For more information please go to https://www.cacert.org/policy/RootDistributionLicense.php.
153
-
154
152
This package contains software from a number of other projects including Bash, zlib, curl, tcl/tk, perl, MSYS2 and a number of libraries and utilities from the GNU project, licensed under the GNU General Public License. Likewise, it contains Perl which is dual licensed under the GNU General Public License and the Artistic License.
Copy file name to clipboardExpand all lines: content/merge-conflicts-resolving-and-remembering-them.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -15,7 +15,7 @@ The magic is in the [REuse REcorded REsolution (rerere)](https://git-scm.com/doc
15
15
The documentation is terse, so let's also point to some on-line articles:
16
16
*[Fun with rerere](https://gitster.livejournal.com/41795.html) from the Git maintainer
17
17
*[Fix conflicts only once with git rerere](https://medium.com/@porteneuve/fix-conflicts-only-once-with-git-rerere-7d116b2cec67) Nice graphs and examples.
18
-
*[Do you even rerere?](https://blog.theodo.fr/2015/01/do-you-even-rerere/) Good discussion, including `rerere-train`.
18
+
*[Do you even rerere?](https://blog.theodo.com/2015/01/do-you-even-rerere/) Good discussion, including `rerere-train`.
19
19
*[rerere-train.sh](https://github.com/git/git/blob/HEAD/contrib/rerere-train.sh) use the 'blame' button for extra commit info.
20
20
*[Are there any downsides to enabling git rerere?](https://stackoverflow.com/q/5519244/717355) Not really, but read and learn.
21
21
*[Smarter rebase avoiding redundant work?](https://stackoverflow.com/q/10601541/717355) more rerere-train answers
@@ -34,7 +34,7 @@ Threads about the internal workings:
34
34
-[saving and replaying multiple variants with rerere](https://public-inbox.org/git/1442275050-30497-1-git-send-email-gitster@pobox.com/) 2015-09-14
35
35
-[Should rerere auto-update a merge resolution?](https://public-inbox.org/git/CACPiFCJH7RSb_rz6M6ADuGi0q+oeWYhE1fNMQC0EUcCn_kCJwg@mail.gmail.com/) 2017-08-23
36
36
-[rebase: use OPT_RERERE_AUTOUPDATE()](https://public-inbox.org/git/20190319190317.6632-4-phillip.wood123@gmail.com/#r) 2019-03-19
37
-
-[git/Documentation/technical/rerere.txt](https://github.com/git/git/blob/HEAD/Documentation/technical/rerere.txt) committed on 5 Aug 2018
37
+
-[git/Documentation/technical/rerere.adoc](https://github.com/git/git/blob/HEAD/Documentation/technical/rerere.adoc) committed on 5 Aug 2018
38
38
-[git rerere unresolve file](https://public-inbox.org/git/200911211958.40872.j6t@kdbg.org/) 2009-11-21 patch series
39
39
-[Make git-rerere a builtin](https://public-inbox.org/git/Pine.LNX.4.63.0612201738000.19693@wbgn013.biozentrum.uni-wuerzburg.de/) 2006-12-20 convert from a perl script
40
40
-[Add a test for git-rerere](https://public-inbox.org/git/Pine.LNX.4.63.0612201737190.19693@wbgn013.biozentrum.uni-wuerzburg.de/) 2006-12-20
Copy file name to clipboardExpand all lines: content/releasing-git-for-windows.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -116,7 +116,7 @@ This one is _really_ easy (as long as nothing is broken...): add a PR comment wi
116
116
117
117
Note: The `pacman` upload always takes this long.
118
118
119
-
Sadly, things are broken a lot. In those cases, the logs have to be analyzed, and the GitHub workflow definition needs to be edited (on the `release` branch of https://github.com/git-for-windows/git-for-windows-automation), and the failing jobs of the workflow run have to be rerunExamples for failures that happened in the past:
119
+
Sadly, things are broken a lot. In those cases, the logs have to be analyzed, and the GitHub workflow definition needs to be edited (on the `release` branch of [`git-for-windows/git-for-windows-automation`](https://github.com/git-for-windows/git-for-windows-automation)), and the failing jobs of the workflow run have to be rerunExamples for failures that happened in the past:
120
120
121
121
- Timeouts while uploading the GitHub Release. In that case, the partially-populated draft release has to be deleted manually (first delete the assets, or it won't delete the release), and then re-deploy.
Copy file name to clipboardExpand all lines: content/setting-your-core-editor-e-g-notepad-plus-plus-.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -10,7 +10,7 @@ Many users prefer their local Windows graphic editor, such as Notepad++, this no
10
10
11
11
# Setting Notepad++ as your Core.Editor
12
12
13
-
Notepad++ provides multiple useful options ([Npp](http://notepad-plus-plus.org)[wiki](http://docs.notepad-plus-plus.org/)). Install as required.
13
+
Notepad++ provides multiple useful options ([Npp](https://notepad-plus-plus.org)[online help](https://notepad-plus-plus.org/online-help/). Install as required.
14
14
15
15
The command
16
16
@@ -32,5 +32,5 @@ window is closed.
32
32
Some users prefer not to use the '-notabbar', as it may become a preferred option if you didn't
33
33
have an Npp session already open, though the -nosession should prevent this.
34
34
35
-
The canonical discussion is at [stackoverflow/1634161](http://stackoverflow.com/questions/1634161/how-do-i-use-notepad-or-other-with-msysgit). Note that in Git for Windows, with its MSYS2 underpinnings, we do pass paths that are
35
+
The canonical discussion is at [stackoverflow/1634161](https://stackoverflow.com/questions/1634161/how-do-i-use-notepad-or-other-with-msysgit). Note that in Git for Windows, with its MSYS2 underpinnings, we do pass paths that are
36
36
understandable by Npp, so there should be no need for any of the Cygwin path mangling trickery discussed in the SO thread.
Copy file name to clipboardExpand all lines: content/technical-overview.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -29,7 +29,7 @@ Afterwards you need to install git to make these changes available to the instal
29
29
30
30
If you made any documentation changes, you need to install the documentation too: `make install-html && prefix=/mingw64 make -C contrib/subtree install-html` (the second make invocation installs the `git-subtree.html` which is otherwise missing and leads to an error by the portable installer).
31
31
32
-
In some cases, the change you want to make is not in git itself, but in the additional files needed to emulate the *ix environment git expects (things like `grep`, `find`, `cat`,...), or in additional helper files (e.g. `start-ssh-agent.cmd`). These files come from [Msys](https://github.com/git-for-windows/MSYS2-packages) and [Mingw](https://github.com/git-for-windows/MINGW-packages) packages. Please see the documentation for how to make [changes to these packages](./package-management.html#technical-details). Some files are also in the `build-extras` repo in the subdir [`mingw-w64-git-extra`](https://github.com/git-for-windows/build-extra/tree/HEAD/mingw-w64-git-extra) (the script which calls notepad as a commit message editor, diff filter for word files,...). The source code for these files are also under `/usr/src` but need to be checked out first (e.g. `cd /usr/src/MINGW-packages && git fetch && git checkout main`).
32
+
In some cases, the change you want to make is not in git itself, but in the additional files needed to emulate the *ix environment git expects (things like `grep`, `find`, `cat`,...), or in additional helper files (e.g. `start-ssh-agent.cmd`). These files come from [Msys](https://github.com/git-for-windows/MSYS2-packages) and [Mingw](https://github.com/git-for-windows/MINGW-packages) packages. Please see the documentation for how to make [changes to these packages](./package-management.html#technical-details). Some files are also in the `build-extras` repo in the subdir [`mingw-w64-git-extra`](https://github.com/git-for-windows/build-extra/tree/HEAD/git-extra) (the script which calls notepad as a commit message editor, diff filter for word files,...). The source code for these files are also under `/usr/src` but need to be checked out first (e.g. `cd /usr/src/MINGW-packages && git fetch && git checkout main`).
Copy file name to clipboardExpand all lines: content/windows-vs-linux-fork-and-exec-semantics.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -11,7 +11,7 @@ Note that there's a newer, single call method on Linux ([`posix_spawn()`](http:/
11
11
12
12
## Before start
13
13
14
-
All information about Linux is a brief retelling of Robert Love's book: [Linux Kernel Development](https://doc.lagout.org/operating%20system%20/linux/Linux%20Kernel%20Development%2C%203rd%20Edition.pdf).
14
+
All information about Linux is a brief retelling of Robert Love's book: [Linux Kernel Development](https://openlibrary.org/books/OL3312853M/Linux_Kernel_Development).
15
15
I definitely recommend you to read this book by yourself, especially if this article wasn't enough for you. I will oversimplify, otherwise I'd need to put the whole book here.
16
16
17
17
`fork()` on Windows is emulated by *MSYS*, while there is no `fork()` in *MINGW*. That is partially what makes [MSYS much slower than MINGW](./the-difference-between-mingw-and-msys2.html).
Copy file name to clipboardExpand all lines: content/zip-archives-extracting-the-released-archives.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -19,8 +19,8 @@ We use the old .sfx component that used to be hosted on http://7zsfx.info. This
19
19
*`-gm2` hides the extraction dialog completely (silent mode)
20
20
*`-InstallPath` sets the target path (you need double backslashes)
21
21
22
-
You can still see the switches in the Internet Archive: https://web.archive.org/web/20160402074100/http://www.7zsfx.info/en/switches.html. (see also this helpful StackOverflow answer: http://stackoverflow.com/a/32105548).
22
+
You can still see the switches in the Internet Archive: https://web.archive.org/web/20160402074100/http://www.7zsfx.info/en/switches.html. (see also [this helpful StackOverflow answer](https://stackoverflow.com/a/32105548)).
23
23
24
24
25
25
26
-
This page responds to the question in https://github.com/git-for-windows/git/issues/986
26
+
This page responds to the question in https://github.com/git-for-windows/git/issues/986
0 commit comments