|
Home > Archive > Debian Developers > August 2005 > Re: arch, svn, cvs
You are viewing an archived Text-only version of the thread.
To view this thread in it's original format and/or if you want to reply to
this thread please [click here]
| Author |
Re: arch, svn, cvs
|
|
| George Danchev 2005-08-30, 6:01 pm |
| On Tuesday 30 August 2005 15:32, martin f krafft wrote:
> also sprach Martin Langhoff <martin.langhoff@gmail.com> [2005.08.30.1404
+0200]:
>
> How does git aide you in identifying the differences in changes
> between two trees?
You can have any other's work as different branches (also as separate local
repositories and just diff between), then use a nice graphical tool 'gitk
--all' to show you both of these branches and their histories (well the
lowlevel 'git-diff-*' tools are called which you can use manually), then try
to merge using 'git resolve b1 b2' [1]. Here is a more advanced example of
merging [2] as well as seeing whatchanged and where. Merging is the man here.
[1] http://www.kernel.org/pub/software/...s/tutorial.html
[2]
http://www.kernel.org/pub/software/...ic-branches.txt
--
pub 4096R/0E4BD0AB 2003-03-18 <people.fccf.net/danchev/key pgp.mit.edu>
fingerprint 1AE7 7C66 0A26 5BFF DF22 5D55 1C57 0C89 0E4B D0AB
--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
|
|
|
|
|