win 2000 Post: 27571

7 More Discussions You Might Find Interesting

1. Cybersecurity

Remote shell with Win 2000

I need to use the RSH command to run a shell script on my Unix box from Win 2000. I'm using the etc/hosts.equiv file for configuring Unix. In it I have the hostname and username as required. As a test, I enter the following on the Win 2000 dos command: rsh servername -l username df -k. The...

2. Programming

ftp a file from remote pc of win 2000

Hello. I am programming in C on HP-UNIX system,i want ftp a file from remote pc which is window 2000 system,i donot how config my HP-UNIX and pc, i donot how program in C or in shell. Thank you for help.

3. UNIX for Dummies Questions & Answers

Win 3.1 OS

This is a bit diff. question in this forum but all of your's comments would be of great help to me. Problem is that I am using Win 3.1 version operating system on DOS. Here so many .tmp files get generated due to print commands. Can you suggest any utility which will delete all tmp files...

4. Windows & DOS: Issues & Discussions

win,unix

hi, Could anyone tell me mounting windows directories in unix.I have used mount command in all directions like mounting hd00,hd1,hd2,hd3 and so on but that don't work for me Mohan

5. UNIX for Dummies Questions & Answers

Using Samba to join a win 2000 Domain

I am trying to set samba up to join my windows 2000 domain and I am having troubles If anyone if familiar with this help would be greatly appreciated I issue the following command # ./smbpasswd -j DOMAIN -r DOMAINCONTROLER And the following gets returned load_client_codepage: filename...

6. UNIX for Dummies Questions & Answers

Freebsd and win 2000 working 2gether?

Hi Brothers, Please, I've just purchased a new PC and I would like to have both win 2000 and freebsd in the same hard drive, ( 40GB and 128Mb ) can you please help how to set up my new hard drive , please! Thank you..... aka Polymorphous

7. Windows & DOS: Issues & Discussions

Win 200

I have my little one of 7 years old running win 2000 the Spanish version and we need to reinstall the OS. One major problem, we have lost the case in which the os came in. Wich means we do not have the key code to reinstall. It took me a long time just to find the os in Spanish. I have been...

LEARN ABOUT LINUX

git-cherry

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 1.8.5.3							    01/14/2014							     GIT-CHERRY(1)