diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
| commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
| tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/Documentation/git-request-pull.txt | |
| parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) | |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/Documentation/git-request-pull.txt')
| -rw-r--r-- | third_party/git/Documentation/git-request-pull.txt | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/third_party/git/Documentation/git-request-pull.txt b/third_party/git/Documentation/git-request-pull.txt deleted file mode 100644 index 4d4392d0f841..000000000000 --- a/third_party/git/Documentation/git-request-pull.txt +++ /dev/null @@ -1,79 +0,0 @@ -git-request-pull(1) -=================== - -NAME ----- -git-request-pull - Generates a summary of pending changes - -SYNOPSIS --------- -[verse] -'git request-pull' [-p] <start> <url> [<end>] - -DESCRIPTION ------------ - -Generate a request asking your upstream project to pull changes into -their tree. The request, printed to the standard output, -begins with the branch description, summarizes -the changes and indicates from where they can be pulled. - -The upstream project is expected to have the commit named by -`<start>` and the output asks it to integrate the changes you made -since that commit, up to the commit named by `<end>`, by visiting -the repository named by `<url>`. - - -OPTIONS -------- --p:: - Include patch text in the output. - -<start>:: - Commit to start at. This names a commit that is already in - the upstream history. - -<url>:: - The repository URL to be pulled from. - -<end>:: - Commit to end at (defaults to HEAD). This names the commit - at the tip of the history you are asking to be pulled. -+ -When the repository named by `<url>` has the commit at a tip of a -ref that is different from the ref you have locally, you can use the -`<local>:<remote>` syntax, to have its local name, a colon `:`, and -its remote name. - - -EXAMPLES --------- - -Imagine that you built your work on your `master` branch on top of -the `v1.0` release, and want it to be integrated to the project. -First you push that change to your public repository for others to -see: - - git push https://git.ko.xz/project master - -Then, you run this command: - - git request-pull v1.0 https://git.ko.xz/project master - -which will produce a request to the upstream, summarizing the -changes between the `v1.0` release and your `master`, to pull it -from your public repository. - -If you pushed your change to a branch whose name is different from -the one you have locally, e.g. - - git push https://git.ko.xz/project master:for-linus - -then you can ask that to be pulled with - - git request-pull v1.0 https://git.ko.xz/project master:for-linus - - -GIT ---- -Part of the linkgit:git[1] suite |