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-merge-tree.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-merge-tree.txt')
| -rw-r--r-- | third_party/git/Documentation/git-merge-tree.txt | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/third_party/git/Documentation/git-merge-tree.txt b/third_party/git/Documentation/git-merge-tree.txt deleted file mode 100644 index 58731c194229..000000000000 --- a/third_party/git/Documentation/git-merge-tree.txt +++ /dev/null @@ -1,29 +0,0 @@ -git-merge-tree(1) -================= - -NAME ----- -git-merge-tree - Show three-way merge without touching index - - -SYNOPSIS --------- -[verse] -'git merge-tree' <base-tree> <branch1> <branch2> - -DESCRIPTION ------------ -Reads three tree-ish, and output trivial merge results and -conflicting stages to the standard output. This is similar to -what three-way 'git read-tree -m' does, but instead of storing the -results in the index, the command outputs the entries to the -standard output. - -This is meant to be used by higher level scripts to compute -merge results outside of the index, and stuff the results back into the -index. For this reason, the output from the command omits -entries that match the <branch1> tree. - -GIT ---- -Part of the linkgit:git[1] suite |