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/rev-list-description.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/rev-list-description.txt')
-rw-r--r-- | third_party/git/Documentation/rev-list-description.txt | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/third_party/git/Documentation/rev-list-description.txt b/third_party/git/Documentation/rev-list-description.txt deleted file mode 100644 index a9efa7fa2722..000000000000 --- a/third_party/git/Documentation/rev-list-description.txt +++ /dev/null @@ -1,61 +0,0 @@ -List commits that are reachable by following the `parent` links from the -given commit(s), but exclude commits that are reachable from the one(s) -given with a '{caret}' in front of them. The output is given in reverse -chronological order by default. - -You can think of this as a set operation. Commits reachable from any of -the commits given on the command line form a set, and then commits reachable -from any of the ones given with '{caret}' in front are subtracted from that -set. The remaining commits are what comes out in the command's output. -Various other options and paths parameters can be used to further limit the -result. - -Thus, the following command: - -ifdef::git-rev-list[] ------------------------------------------------------------------------ -$ git rev-list foo bar ^baz ------------------------------------------------------------------------ -endif::git-rev-list[] -ifdef::git-log[] ------------------------------------------------------------------------ -$ git log foo bar ^baz ------------------------------------------------------------------------ -endif::git-log[] - -means "list all the commits which are reachable from 'foo' or 'bar', but -not from 'baz'". - -A special notation "'<commit1>'..'<commit2>'" can be used as a -short-hand for "^'<commit1>' '<commit2>'". For example, either of -the following may be used interchangeably: - -ifdef::git-rev-list[] ------------------------------------------------------------------------ -$ git rev-list origin..HEAD -$ git rev-list HEAD ^origin ------------------------------------------------------------------------ -endif::git-rev-list[] -ifdef::git-log[] ------------------------------------------------------------------------ -$ git log origin..HEAD -$ git log HEAD ^origin ------------------------------------------------------------------------ -endif::git-log[] - -Another special notation is "'<commit1>'...'<commit2>'" which is useful -for merges. The resulting set of commits is the symmetric difference -between the two operands. The following two commands are equivalent: - -ifdef::git-rev-list[] ------------------------------------------------------------------------ -$ git rev-list A B --not $(git merge-base --all A B) -$ git rev-list A...B ------------------------------------------------------------------------ -endif::git-rev-list[] -ifdef::git-log[] ------------------------------------------------------------------------ -$ git log A B --not $(git merge-base --all A B) -$ git log A...B ------------------------------------------------------------------------ -endif::git-log[] |