git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: lamikr <lamikr@cc.jyu.fi>
To: git@vger.kernel.org
Subject: Diff between the non-head git work dir and non-git kernel sources
Date: Tue, 08 Nov 2005 22:54:32 +0200	[thread overview]
Message-ID: <43711088.6070701@cc.jyu.fi> (raw)

Hi

I am sorry if this a newbie question, but I have tried to read howtos 
from the web without finding clear documentation or howto to following 
kind of problem.

I have checked out the omap git tree with command

    git-clone rsync://source.mvista.com/git/linux-omap-2.6.git 
linux-omap-2.6

and now I am obviously having the omap kernel head in the linux-omap-2.6 
working directory + hidden ".git" with commit history. In addition I 
have my own "non git" development tree that is made on top of 
traditional kernel snapshots. I however know that the sources in this 
dir reflects to state in git history when following patch was committed

    
http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff;h=d24aff0bd3e788d69a45a9d1b1eecda88d847a41

I would now like to revert the sources in git working dir to state that 
was after this d24aff0bd3e788d69a45a9d1b1eecda88d847a41 commit
and then make the diff between that kernel source version and my non-git 
source version and I am now trying to find out what is the "correct" way 
of doing this.

1) If understood the documentation correctly I could move the working 
dir to contain the state after
d24aff0bd3e788d69a45a9d1b1eecda88d847a41 commit in a following way
a) open qgit and mark correct commit with "make tag mytag" command
b) change the files in working dir to be same than during the "mytag" 
commit time by using command git checkout -f mytag
   
Are there simpler method for doing this that uses commit id 
d24aff0bd3e788d69a45a9d1b1eecda88d847a41 directly without need to make 
tag or branch?

2) Does git-diff support making the diff between git's working dir and 
"my non" git kernel source dir.
Or should I just just use normal diff and order that to ignore .git dir 
and .gitignore files?

Mika

             reply	other threads:[~2005-11-08 20:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-08 20:54 lamikr [this message]
2005-11-08 22:18 ` Diff between the non-head git work dir and non-git kernel sources Junio C Hamano
2005-11-08 23:52   ` lamikr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=43711088.6070701@cc.jyu.fi \
    --to=lamikr@cc.jyu.fi \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).