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-index.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-index.txt')
-rw-r--r-- | third_party/git/Documentation/git-merge-index.txt | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/third_party/git/Documentation/git-merge-index.txt b/third_party/git/Documentation/git-merge-index.txt deleted file mode 100644 index 2ab84a91e538..000000000000 --- a/third_party/git/Documentation/git-merge-index.txt +++ /dev/null @@ -1,83 +0,0 @@ -git-merge-index(1) -================== - -NAME ----- -git-merge-index - Run a merge for files needing merging - - -SYNOPSIS --------- -[verse] -'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*) - -DESCRIPTION ------------ -This looks up the <file>(s) in the index and, if there are any merge -entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty -argument if no file), and <file> as argument 4. File modes for the three -files are passed as arguments 5, 6 and 7. - -OPTIONS -------- -\--:: - Do not interpret any more arguments as options. - --a:: - Run merge against all files in the index that need merging. - --o:: - Instead of stopping at the first failed merge, do all of them - in one shot - continue with merging even when previous merges - returned errors, and only return the error code after all the - merges. - --q:: - Do not complain about a failed merge program (a merge program - failure usually indicates conflicts during the merge). This is for - porcelains which might want to emit custom messages. - -If 'git merge-index' is called with multiple <file>s (or -a) then it -processes them in turn only stopping if merge returns a non-zero exit -code. - -Typically this is run with a script calling Git's imitation of -the 'merge' command from the RCS package. - -A sample script called 'git merge-one-file' is included in the -distribution. - -ALERT ALERT ALERT! The Git "merge object order" is different from the -RCS 'merge' program merge object order. In the above ordering, the -original is first. But the argument order to the 3-way merge program -'merge' is to have the original in the middle. Don't ask me why. - -Examples: - ----- -torvalds@ppc970:~/merge-test> git merge-index cat MM -This is MM from the original tree. # original -This is modified MM in the branch A. # merge1 -This is modified MM in the branch B. # merge2 -This is modified MM in the branch B. # current contents ----- - -or - ----- -torvalds@ppc970:~/merge-test> git merge-index cat AA MM -cat: : No such file or directory -This is added AA in the branch A. -This is added AA in the branch B. -This is added AA in the branch B. -fatal: merge program failed ----- - -where the latter example shows how 'git merge-index' will stop trying to -merge once anything has returned an error (i.e., `cat` returned an error -for the AA file, because it didn't exist in the original, and thus -'git merge-index' didn't even try to merge the MM thing). - -GIT ---- -Part of the linkgit:git[1] suite |