Sponsored Content
Operating Systems Linux SuSE What happened to my three threads? Post 55870 by Mark Ward on Tuesday 21st of September 2004 10:59:12 AM
Old 09-21-2004
Ah well, teach me to pay attention to which forum topic I'm in when I post I guess. Will type them out again later.

Thanks for letting me know.

Mark.
 

8 More Discussions You Might Find Interesting

1. Post Here to Contact Site Administrators and Moderators

what happened?

A few hours ago I made several reasonable posts to this forum and now they have dissapeared. I read and followed the rules, and I sure didn't break any, but gone they are :( I know I only joined the forum today, but do the posts have to be authorised or something? ... (14 Replies)
Discussion started by: cw1972
14 Replies

2. UNIX for Dummies Questions & Answers

What happened to my user accounts?

Ahhhh!!!!!!!! All of my user accounts can no longer login. I suspected a corrupt passwd file, but everything looks OK and the passwd file works when I copy it to another system. All user accounts cannot login...they recieve a "No directory defined" error, but I can logon using root just fine. I... (13 Replies)
Discussion started by: jskillet
13 Replies

3. What is on Your Mind?

what happened to ygor..??

:D anyone hear from ygor..? haven't seen him post in a while... wonder what he is up to..! the last i heard he was the D25khan.. that was him right guys ??? being a newbie myself that is one dude that i admire. him Norsk, Perdebro, RTM , Google and Zazzybob all real genius.. and the most... (2 Replies)
Discussion started by: moxxx68
2 Replies

4. Shell Programming and Scripting

What happened with AWK?

The second script seems not to work. (3 Replies)
Discussion started by: endeavour1985
3 Replies

5. UNIX for Dummies Questions & Answers

What happened to mkisofs ?

I've been using a mkisofs line like this for years without problem # mkisofs -J -R -V 'Vol Label' -o /output/path/FILE.ISO /input/path/ Now, however, it gives a UTR-8 character message at the start INFO: UTF-8 character encoding detected by locale settings. Assuming UTF-8... (0 Replies)
Discussion started by: Bobby
0 Replies

6. UNIX for Dummies Questions & Answers

What Happened :(

Hello, I have created a dosrename script and it was working fine unitl today. I can't think what i have changed (don't think i have to be honest). The error is when i run the script it says the file i am trying to rename does not exist when it blatently does. Or is it a typo when i run the... (4 Replies)
Discussion started by: jazz8146
4 Replies

7. Solaris

what happened to admintool?

what happened to admintool in Solaris10? (2 Replies)
Discussion started by: mndavies
2 Replies

8. What is on Your Mind?

What happened to coolerbooks?

I just found the website coolerbooks.com a couple weeks ago. It was a site that had loads of free ebooks for download. But now it seems to have been hijacked by some Microsoft search thing. There was an article last year claiming it teamed with Google (the anti-Microsoft!) to offer the... (2 Replies)
Discussion started by: KenJackson
2 Replies
GIT-CHERRY(1)                                                       Git Manual                                                       GIT-CHERRY(1)

NAME
git-cherry - Find commits yet to be applied to upstream SYNOPSIS
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 git-cherry-pick(1), git-am(1) or 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 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
git-patch-id(1) GIT
Part of the git(1) suite Git 2.17.1 10/05/2018 GIT-CHERRY(1)
All times are GMT -4. The time now is 04:56 AM.
Unix & Linux Forums Content Copyright 1993-2022. All Rights Reserved.
Privacy Policy