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-diff-files.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-diff-files.txt')
| -rw-r--r-- | third_party/git/Documentation/git-diff-files.txt | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/third_party/git/Documentation/git-diff-files.txt b/third_party/git/Documentation/git-diff-files.txt deleted file mode 100644 index 906774f0f7e0..000000000000 --- a/third_party/git/Documentation/git-diff-files.txt +++ /dev/null @@ -1,52 +0,0 @@ -git-diff-files(1) -================= - -NAME ----- -git-diff-files - Compares files in the working tree and the index - - -SYNOPSIS --------- -[verse] -'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...] - -DESCRIPTION ------------ -Compares the files in the working tree and the index. When paths -are specified, compares only those named paths. Otherwise all -entries in the index are compared. The output format is the -same as for 'git diff-index' and 'git diff-tree'. - -OPTIONS -------- -include::diff-options.txt[] - --1 --base:: --2 --ours:: --3 --theirs:: --0:: - Diff against the "base" version, "our branch" or "their - branch" respectively. With these options, diffs for - merged entries are not shown. -+ -The default is to diff against our branch (-2) and the -cleanly resolved paths. The option -0 can be given to -omit diff output for unmerged entries and just show "Unmerged". - --c:: ---cc:: - This compares stage 2 (our branch), stage 3 (their - branch) and the working tree file and outputs a combined - diff, similar to the way 'diff-tree' shows a merge - commit with these flags. - --q:: - Remain silent even on nonexistent files - - -include::diff-format.txt[] - -GIT ---- -Part of the linkgit:git[1] suite |