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-cherry.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-cherry.txt')
| -rw-r--r-- | third_party/git/Documentation/git-cherry.txt | 145 |
1 files changed, 0 insertions, 145 deletions
diff --git a/third_party/git/Documentation/git-cherry.txt b/third_party/git/Documentation/git-cherry.txt deleted file mode 100644 index 0ea921a59316..000000000000 --- a/third_party/git/Documentation/git-cherry.txt +++ /dev/null @@ -1,145 +0,0 @@ -git-cherry(1) -============= - -NAME ----- -git-cherry - Find commits yet to be applied to upstream - -SYNOPSIS --------- -[verse] -'git cherry' [-v] [<upstream> [<head> [<limit>]]] - -DESCRIPTION ------------ -Determine whether there are commits in `<head>..<upstream>` that are -equivalent to those in the range `<limit>..<head>`. - -The equivalence test is based on the diff, after removing whitespace -and line numbers. git-cherry therefore detects when commits have been -"copied" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or -linkgit:git-rebase[1]. - -Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with -`-` for commits that have an equivalent in <upstream>, and `+` for -commits that do not. - -OPTIONS -------- --v:: - Show the commit subjects next to the SHA1s. - -<upstream>:: - Upstream branch to search for equivalent commits. - Defaults to the upstream branch of HEAD. - -<head>:: - Working branch; defaults to HEAD. - -<limit>:: - Do not report commits up to (and including) limit. - -EXAMPLES --------- - -Patch workflows -~~~~~~~~~~~~~~~ - -git-cherry is frequently used in patch-based workflows (see -linkgit:gitworkflows[7]) to determine if a series of patches has been -applied by the upstream maintainer. In such a workflow you might -create and send a topic branch like this: - ------------- -$ git checkout -b topic origin/master -# work and create some commits -$ git format-patch origin/master -$ git send-email ... 00* ------------- - -Later, you can see whether your changes have been applied by saying -(still on `topic`): - ------------- -$ git fetch # update your notion of origin/master -$ git cherry -v ------------- - -Concrete example -~~~~~~~~~~~~~~~~ - -In a situation where topic consisted of three commits, and the -maintainer applied two of them, the situation might look like: - ------------- -$ git log --graph --oneline --decorate --boundary origin/master...topic -* 7654321 (origin/master) upstream tip commit -[... snip some other commits ...] -* cccc111 cherry-pick of C -* aaaa111 cherry-pick of A -[... snip a lot more that has happened ...] -| * cccc000 (topic) commit C -| * bbbb000 commit B -| * aaaa000 commit A -|/ -o 1234567 branch point ------------- - -In such cases, git-cherry shows a concise summary of what has yet to -be applied: - ------------- -$ git cherry origin/master topic -- cccc000... commit C -+ bbbb000... commit B -- aaaa000... commit A ------------- - -Here, we see that the commits A and C (marked with `-`) can be -dropped from your `topic` branch when you rebase it on top of -`origin/master`, while the commit B (marked with `+`) still needs to -be kept so that it will be sent to be applied to `origin/master`. - - -Using a limit -~~~~~~~~~~~~~ - -The optional <limit> is useful in cases where your topic is based on -other work that is not in upstream. Expanding on the previous -example, this might look like: - ------------- -$ git log --graph --oneline --decorate --boundary origin/master...topic -* 7654321 (origin/master) upstream tip commit -[... snip some other commits ...] -* cccc111 cherry-pick of C -* aaaa111 cherry-pick of A -[... snip a lot more that has happened ...] -| * cccc000 (topic) commit C -| * bbbb000 commit B -| * aaaa000 commit A -| * 0000fff (base) unpublished stuff F -[... snip ...] -| * 0000aaa unpublished stuff A -|/ -o 1234567 merge-base between upstream and topic ------------- - -By specifying `base` as the limit, you can avoid listing commits -between `base` and `topic`: - ------------- -$ git cherry origin/master topic base -- cccc000... commit C -+ bbbb000... commit B -- aaaa000... commit A ------------- - - -SEE ALSO --------- -linkgit:git-patch-id[1] - -GIT ---- -Part of the linkgit:git[1] suite |