diff options
| author | Matthias Sohn | 2010-12-16 00:35:12 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2010-12-16 16:39:33 +0000 |
| commit | d11a2cf9fcea99052572fc599bf3883f73dcd9a7 (patch) | |
| tree | d9e1a14b0feb0e14f103b2cdda23f3bdd9788b41 | |
| parent | 7db446b50ff4fb83a2e9725dfd384d2d913b13d5 (diff) | |
| download | egit-d11a2cf9fcea99052572fc599bf3883f73dcd9a7.tar.gz egit-d11a2cf9fcea99052572fc599bf3883f73dcd9a7.tar.xz egit-d11a2cf9fcea99052572fc599bf3883f73dcd9a7.zip | |
Update EGit Documentation for 0.10
Also include JGit User Guide and New and Noteworthy 0.10.
Used ImageOptim to reduce image sizes.
Change-Id: I2232c3266bd89f7afbb14dd73c4465968cd62a32
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
286 files changed, 2307 insertions, 3157 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml index d9904e629b..d9c4ba78c7 100644 --- a/org.eclipse.egit.doc/build-help.xml +++ b/org.eclipse.egit.doc/build-help.xml @@ -37,8 +37,9 @@ navigationimages="true" title="EGit Documentation" helpPrefix="help" generateUnifiedToc="true"> <path name="EGit/User_Guide" title="EGit User Guide" /> - <path name="EGit/New_and_Noteworthy/0.9" title="EGit 0.9 New and Noteworthy" /> - <path name="JGit/New_and_Noteworthy/0.9" title="JGit 0.9 New and Noteworthy" /> + <path name="JGit/User_Guide" title="JGit User Guide" /> + <path name="EGit/New_and_Noteworthy/0.10" title="EGit 0.10 New and Noteworthy" /> + <path name="JGit/New_and_Noteworthy/0.10" title="JGit 0.10 New and Noteworthy" /> <path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" /> <stylesheet url="book.css" /> <pageAppendum> diff --git a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html index e357d47fdc..4c5d3138b6 100644 --- a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html +++ b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html @@ -29,36 +29,36 @@ <p>This post is not about the relative merits of Git over CVS/SVN, or of Git versus other distributed version control systems (DVCS) like Mercurial (Hg). There's other sites which can give those flavours if needed.</p> <p>Once you understand the conceptual differences between CVS/SVN and Git, and then subsequently start to use Git, you may find it very difficult to go back. You should only really start to experiment if you think you're going to migrate in the near future, because using Git is like watching TV in colour; once you've discovered it, it's really difficult to go back to black & white.</p> <dl> - <dd>☞ + <dd>☞ <b>Once you start to use a DVCS, it's very difficult to want to go back</b> </dd> </dl> <h2 id="Centralised_version_control_systems">Centralised version control systems</h2> - <p>So, what do you need to know about Git? Well, both CVS and SVN are known as - <i>centralised</i> version control systems (CVCS). That is, there is one Master repository where people share code; everyone checks out their code (or branch) from that repository, and checks changes back in. For code that needs to be sent person-to-person (for example, for review, or as a way of contributing fixes), it is possible to create a - <i>patch</i>, which is a diff of your code against the given Master repository version (often HEAD, but sometimes a branch like Eclipse_35). + <p>So, what do you need to know about Git? Well, both CVS and SVN are known as + <i>centralised</i> version control systems (CVCS). That is, there is one Master repository where people share code; everyone checks out their code (or branch) from that repository, and checks changes back in. For code that needs to be sent person-to-person (for example, for review, or as a way of contributing fixes), it is possible to create a + <i>patch</i>, which is a diff of your code against the given Master repository version (often HEAD, but sometimes a branch like Eclipse_35). </p> <p>There are two problems that surface with a centralised version control system, although these problems aren't immediately apparent or obvious: </p> <ul> <li>You need to be 'on-line' to perform actions, like diff or patch.<sup>*</sup> </li> <li>Patches generated against a particular branch can become outdated fairly quickly as development of the snapshot-in-time branch moves on (e.g. when it is time to apply the patch, HEAD is different than it was when the patch was generated).</li> </ul> - <p>The first problem is rarely apparent for those working with Eclipse in a location at (or near to) the repository itself. Those in the same continent will rarely experience delays due to global networking variance; in addition, they tend to be employed in an organisation and sit at a desktop connected to wired networking for most of the day. Road warriors (those with laptops and who code from the local coffee shop) tend to operate in a more frequently disconnected mode, which limits repository functionality to when they are connected. - <i>(*A note on SVN: since SVN keeps the last-known-checkout, it's possible to do a limited set of operations while disconnected from SVN, like diff from the last-known-checkout. However, in general, you are prevented from doing many of the operations that are possible while connected.)</i> + <p>The first problem is rarely apparent for those working with Eclipse in a location at (or near to) the repository itself. Those in the same continent will rarely experience delays due to global networking variance; in addition, they tend to be employed in an organisation and sit at a desktop connected to wired networking for most of the day. Road warriors (those with laptops and who code from the local coffee shop) tend to operate in a more frequently disconnected mode, which limits repository functionality to when they are connected. + <i>(*A note on SVN: since SVN keeps the last-known-checkout, it's possible to do a limited set of operations while disconnected from SVN, like diff from the last-known-checkout. However, in general, you are prevented from doing many of the operations that are possible while connected.)</i> </p> - <p>The second problem is simply an artifact of the way in which patches work. These are generally performed against HEAD (a snapshot in time) and then applied later (sometimes months or even + <p>The second problem is simply an artifact of the way in which patches work. These are generally performed against HEAD (a snapshot in time) and then applied later (sometimes months or even <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=4922" target="egit_external">eight years later</a>). Although they record the version of the file they were patched against, the patch itself is sensitive to big changes in the file, sometimes leading to the patch being inapplicable. Even relatively simple operations, like a file-rename, can throw a well-formed CVCS patch out of the window. </p> <h2 id="Distributed_Version_Control_Systems">Distributed Version Control Systems</h2> - <p>Distributed Version Control Systems (DVCS) are a family of version control systems unlike those with which many are familiar. Two of the most popular are - <a href="http://www.git-scm.org" target="egit_external">Git</a> and + <p>Distributed Version Control Systems (DVCS) are a family of version control systems unlike those with which many are familiar. Two of the most popular are + <a href="http://www.git-scm.org" target="egit_external">Git</a> and <a href="http://mercurial.selenic.com" target="egit_external">Hg</a>, although others ( - <a href="http://darcs.net/" target="egit_external">Darcs</a>, - <a href="http://bazaar.canonical.com/en/" target="egit_external">Bazaar</a>, + <a href="http://darcs.net/" target="egit_external">Darcs</a>, + <a href="http://bazaar.canonical.com/en/" target="egit_external">Bazaar</a>, <a href="http://www.bitkeeper.com/" target="egit_external">Bitkeeper</a>, etc.) exist. In a DVCS each user has a complete copy of the repository, including its entire history. A user may potentially push changes to or pull changes from any other repository. Although policy may confer special status to one or more repositories, in principle every repository is a first-class citizen in the DVCS model. This stands in contrast to a centralised version control system, where every individual checks files into and out of an authoritative repository. </p> <dl> - <dd>☞ + <dd>☞ <b>Each user has a full copy of the repository</b> </dd> </dl> @@ -71,54 +71,54 @@ </ol> <p>Let's answer each one of these questions in turn. (If I missed your favourite question, then please feel free to add one in the comments.)</p> <ol> - <li>Yes, the forks - <i>can</i> diverge. But after all, open-source can diverge anyway. There's nothing stopping me from forking the <code>dev.eclipse.org</code> codebase, and publishing my own version of it called - <a href="http://sourceforge.net/projects/rcpapps/files/maclipse/" target="egit_external">Maclipse</a>. The key thing here is that whilst forks are possible, - <i>forking is not a bad thing in itself</i>. After all, look at Linux and Android; originally, they shared a history, but are now different. XFree86 and X.Org - <a href="http://www.x.org/wiki/XorgFoundation" target="egit_external">split</a> over licensing issues. MySQL was forked to create + <li>Yes, the forks + <i>can</i> diverge. But after all, open-source can diverge anyway. There's nothing stopping me from forking the <code>dev.eclipse.org</code> codebase, and publishing my own version of it called + <a href="http://sourceforge.net/projects/rcpapps/files/maclipse/" target="egit_external">Maclipse</a>. The key thing here is that whilst forks are possible, + <i>forking is not a bad thing in itself</i>. After all, look at Linux and Android; originally, they shared a history, but are now different. XFree86 and X.Org + <a href="http://www.x.org/wiki/XorgFoundation" target="egit_external">split</a> over licensing issues. MySQL was forked to create <a href="http://askmonty.org/wiki/index.php/MariaDB" target="egit_external">MariaDB</a>, and so on.The key thing about forks is that the best survive. X.Org is now the default X client, whereas XFree86 was the default beforehand. The jury is still out on MySQL versus MariaDB. And although Maclipse has been downloaded literally <span title="Actually, about one and a half thousand. That's more than I expected.">tens of times</span>, it hasn't caused a dent in Eclipse's growth. <dl> - <dd>☞ + <dd>☞ <b>Forks happen</b> </dd> </dl> </li> <li>Do not try to bend the <span title="spoon">master repository</span> – that's impossible. Instead, only try to realise the truth; there is no <span title="spoon">master repository</span>. In fact, there's a veritable matrix of master repositories possible. Each repository can be considered a node in a graph; nodes in the graph can be connected to each other in any way. However, rather than an n-n set of links, the graph usually self-organises into a tree-like structure, logically associating with one point that acts as a funnel for everything else. In a sense, that's a master repository – everyone has already made the choice; now you have to understand it. Should an oracle intervene, a neo-master can be chosen. <dl> - <dd>☞ + <dd>☞ <b>There is no master repository</b> </dd> </dl> </li> - <li>Having accepted that there is no master repository, it becomes clear that the repository must live in its entirety on each of the nodes in the DVCS. This usually leads to fears about the size of the repository, even taking into account the fact that storage is cheap.A key point here is that DVCS repositories are usually far - <i>smaller</i> than their counterpart CVCS repositories, not least of which is because everyone has to have a full repository in order to do any work. It's a natural consequence that they're smaller. However, they're also smaller because each repository contains far less scope than a CVCS repository. For example, most organisations will have one mammoth CVCS repository with several thousand top-level 'modules' (or 'projects') underneath. Because of the administrative overhead with 'creating a new repository', it is often easier to reuse the same one for everything. (SVN put some limits on how wide it could grow, which CVS tended not to have; but even so, the main + <li>Having accepted that there is no master repository, it becomes clear that the repository must live in its entirety on each of the nodes in the DVCS. This usually leads to fears about the size of the repository, even taking into account the fact that storage is cheap.A key point here is that DVCS repositories are usually far + <i>smaller</i> than their counterpart CVCS repositories, not least of which is because everyone has to have a full repository in order to do any work. It's a natural consequence that they're smaller. However, they're also smaller because each repository contains far less scope than a CVCS repository. For example, most organisations will have one mammoth CVCS repository with several thousand top-level 'modules' (or 'projects') underneath. Because of the administrative overhead with 'creating a new repository', it is often easier to reuse the same one for everything. (SVN put some limits on how wide it could grow, which CVS tended not to have; but even so, the main <a href="http://svn.apache.org/viewvc?view=revision&revision=908283" target="egit_external">Apache SVN</a> is over 900k revisions.) By contrast, setting up a DVCS is usually nothing more than a directory with a few administrative files inside. It doesn't require administrator privileges or specific ports; in fact, since there's no central server to speak of, it doesn't even need to be shared by network protocols. As a result, a DVCS repository is much more granular – and easy to create – than a traditional CVCS repository. Firstly, it's always on your machine (there's no centralised server to configure) and secondly, all you need access to is a file system. So typically, a DVCS “repository” will often be at the level of an Eclipse project or project working set. For example, although the [ - <a href="http://dev.eclipse.org/viewcvs/index.cgi/?root=RT_Project" target="egit_external">http://dev.eclipse.org/viewcvs/index.cgi/?root=RT_Project</a> CVS <span title="RunTime">RT</span> repository] is shared by - <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.equinox/?root=RT_Project" target="egit_external">Equinox</a> and + <a href="http://dev.eclipse.org/viewcvs/index.cgi/?root=RT_Project" target="egit_external">http://dev.eclipse.org/viewcvs/index.cgi/?root=RT_Project</a> CVS <span title="RunTime">RT</span> repository] is shared by + <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.equinox/?root=RT_Project" target="egit_external">Equinox</a> and <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.ecf/?root=RT_Project&view=log" target="egit_external">ECF</a>, a DVCS-based solution would almost certainly see the Equinox and ECF projects in their own repositories; perhaps, even breaking down further into (say) ECF-Doc and ECF-Bundles. Think of a DVCS repository as one or a few Eclipse projects instead of hundreds of projects together. <dl> - <dd>☞ + <dd>☞ <b>DVCS repositories are much smaller, typically because they only contain a small number of highly-related projects</b> </dd> </dl> </li> - <li>That's not a question. Look, if you want the benefits of a centralised DVCS with pessimistic locking and pessimistic users, then go look at + <li>That's not a question. Look, if you want the benefits of a centralised DVCS with pessimistic locking and pessimistic users, then go look at <a href="http://www-01.ibm.com/software/awdtools/clearcase/" target="egit_external">ClearCase</a>. <dl> - <dd>☞ + <dd>☞ <b>Friends don't let friends use ClearCase</b> </dd> </dl> </li> </ol> <h2 id="How_does_it_work.3F">How does it work?</h2> - <p>There are two pieces of information that identify elements in a CVCS; a file's - <i>name</i>, and its - <i>version</i> (sometimes called + <p>There are two pieces of information that identify elements in a CVCS; a file's + <i>name</i>, and its + <i>version</i> (sometimes called <i>revision</i>). In the case of CVS, each file has its own version stream (1.1, 1.2, 1.3), whilst in SVN, each changeset has a 'repository revision' number. Tags (or branches) are symbolic identifiers which may be attached to any specific set of files or repository revision, and are mostly for human consumption (e.g. HEAD, trunk, ECLIPSE_35). </p> <p>This doesn't work in a DVCS. Because there is no central repository, there is no central repository version number (either for the repository as a whole, or for individual files).</p> - <p>Instead, a DVCS operates at the level of a + <p>Instead, a DVCS operates at the level of a <i>changeset</i>. Logically, a repository is made up from an initial (empty) state, followed by many changesets. (A changeset is merely a change to a set of files; if you think 'patch' from CVS or SVN, then you're not far off.) </p> <p>Identifying a changeset is much harder. We can't use a (global) revision number, because that concept isn't used. Instead, a changeset is represented as a hash of its contents. For example, given the changeset:</p> @@ -130,7 +130,7 @@ </pre> <p>then we can create a 'hash' using (for example) <code>md5</code>, to generate the string <code>0878a8189e6a3ae1ded86d9e9c7cbe3f</code>. When referring to our change with others, we can use this hash to identify the change in question.</p> <dl> - <dd>☞ + <dd>☞ <b>Changesets are identified by a hash of their contents</b> </dd> </dl> @@ -144,11 +144,11 @@ +Git is great </pre> <dl> - <dd>☞ + <dd>☞ <b>Changesets (recursively) contain pointers to the previous changeset</b> </dd> </dl> - <p>Now, if we were to have the same change again, the + <p>Now, if we were to have the same change again, the <i>previous</i> value would be different, so we'd get a different hash value. We could set up an argument: </p> <pre>previous: 48b2179994d494485b79504e8b5a6b23ce24a026 @@ -174,66 +174,66 @@ </pre> <p>Each time, the value of the changeset includes a pointer to what comes before, so the hash is continually changing.</p> <p> - <b>''Note</b><nowiki>: Rather than using </nowiki><code>md5</code>, as shown here, most DVCS (including Git) use an <code>sha1</code> hash instead. Also, the exact way that the prior elements in the tree are stored, and their relationships, isn't accurately portrayed above; however, it gives the idea of how they are organised sufficiently well.'' + <b>''Note</b>: Rather than using <code>md5</code>, as shown here, most DVCS (including Git) use an <code>sha1</code> hash instead. Also, the exact way that the prior elements in the tree are stored, and their relationships, isn't accurately portrayed above; however, it gives the idea of how they are organised sufficiently well.'' </p> <dl> - <dd>☞ + <dd>☞ <b>Git changesets are identified by an SHA-1 hash</b> </dd> </dl> <h2 id="Changesets_and_branches">Changesets and branches</h2> <p>Given that a changeset is a long value like <code>48b2179994d494485b79504e8b5a6b23ce24a026</code>, it can be unfriendly to use. Fortunately, there are a couple of ways around this. Git, like other DVCSs, allow you to use an abbreviated form of the changeset, provided that it's unique in the repository. For small repositories, this means that you can refer to changesets by really short values, like <code>48b21</code> or even <code>48</code>. Conventionally, developers often use 6 digits of the hash – but large projects (like the Linux kernel) tend to have to use slightly larger references in order to have uniqueness.</p> <dl> - <dd>☞ + <dd>☞ <b>Git hashes can be shortened to any unique prefix</b> </dd> </dl> - <p>The current version of your repository is simply a pointer to the end of the tree. For this reason, it's often referred to as a - <i>tip</i>, but <code>HEAD</code> is used the symbolic identifier for what the current repository is pointing to. Similarly, any branch can be referred to by its changeset id, which includes that and all prior changes. The default branch is usually called + <p>The current version of your repository is simply a pointer to the end of the tree. For this reason, it's often referred to as a + <i>tip</i>, but <code>HEAD</code> is used the symbolic identifier for what the current repository is pointing to. Similarly, any branch can be referred to by its changeset id, which includes that and all prior changes. The default branch is usually called <i>master</i>. </p> <dl> - <dd>☞ + <dd>☞ <b>The default 'trunk' is called 'master' in Git</b> </dd> - <dd>☞ + <dd>☞ <b>The tip of the current branch is referred to as 'HEAD</b>' </dd> </dl> <p>As a direct corollary from this, creating branches in a DVCS is fast. All that happens is the repository on disk is updated to point to a different element in the (already physically present) tree, and you're good to go. Furthermore, it's trivial to ping-pong between different branches on the same repository, which can contain different states and evolve independently.</p> <dl> - <dd>☞ + <dd>☞ <b>Creating, and switching between, branches is fast</b> </dd> </dl> - <p>Because branching is so fast, branches get used for things where a user of a CVCS wouldn't normally use branching. For example, each bug in Bugzilla could have a new branch associated with it; if a couple of independent features are being worked on concurrently, they'd get their own branch; if you needed to drop back to do maintenance work on an ECLIPSE_35 branch, then you'd switch to a branch for that as well. Branches get created at least as frequently as + <p>Because branching is so fast, branches get used for things where a user of a CVCS wouldn't normally use branching. For example, each bug in Bugzilla could have a new branch associated with it; if a couple of independent features are being worked on concurrently, they'd get their own branch; if you needed to drop back to do maintenance work on an ECLIPSE_35 branch, then you'd switch to a branch for that as well. Branches get created at least as frequently as <a href="http://www.peterfriese.de/using-cvs-change-sets/" target="egit_external">changesets</a> might in CVS, if not more so. </p> <dl> - <dd>☞ + <dd>☞ <b>Create a new branch for each Bugzilla or feature item that you work on</b> </dd> - <dd>☞ + <dd>☞ <b>Think of branches as throwaway changesets</b> </dd> </dl> <h2 id="Merging">Merging</h2> <p>With great power comes great flexibility, but ultimately, you want to get your changes into some kind of merged stream (like HEAD). One of the fears of unconstrained branching is that of unconstrained merge pains later on. SVN makes this slightly less difficult than CVS, but unless you merge to HEAD frequently, you can easily get lost – particularly when refactorings start happening.</p> <dl> - <dd>☞ + <dd>☞ <b>It's painful to merge in a CVCS; therefore branches tend not to happen</b> </dd> </dl> - <p>Fortunately, DVCSs are all about merging. Given that each node in the changeset tree contains a pointer to its previous node (and transitively, to the beginning of time), it's much more powerful than the standard flat CVCS diff. In other words, not only do you know what changes need to be made, but also - <i>what point in history they need to be made</i>. So, if you have a changeset which renames a file, and then merge in a changeset which points to the file as it was before it was renamed, then a CVCS will just fall over; but a DVCS will be able to apply the change + <p>Fortunately, DVCSs are all about merging. Given that each node in the changeset tree contains a pointer to its previous node (and transitively, to the beginning of time), it's much more powerful than the standard flat CVCS diff. In other words, not only do you know what changes need to be made, but also + <i>what point in history they need to be made</i>. So, if you have a changeset which renames a file, and then merge in a changeset which points to the file as it was before it was renamed, then a CVCS will just fall over; but a DVCS will be able to apply the change <i>before</i> the rename occurred, and then play forward the changes. </p> - <p>Merges are just the weaving together of two (or more) local branches into one. The + <p>Merges are just the weaving together of two (or more) local branches into one. The <a href="http://www.kernel.org/pub//software/scm/git-core/docs/git-merge.html" target="egit_external">git merge</a> documentation has some graphical examples of this; but basically, it's just like any other merge you've seen. However, unlike CVCS, you don't have to specify anything about where you're merging from and to; the trees automatically know what their split point was in the past, and can work it out from there. </p> <dl> - <dd>☞ - <b>Merging is a DVCS like Git is trivial</b> + <dd>☞ + <b>Merging in a DVCS like Git is trivial</b> </dd> </dl> <h2 id="Pulling_and_pushing">Pulling and pushing</h2> @@ -246,20 +246,20 @@ </ul> <p>The first two cases are trivial; if we synchronise trees, they just become a fast-forward merge. In fact, if that occurs, chances are you won't know who is ahead of the other; it will just happen.</p> <p>The last case is only slightly more tricky; a common ancestor must be found; say, <code>746d6c</code>. Then I send changes between my tip and <code>746d6c</code>, and you send changes between your tip and <code>746d6c</code>. That way, we both end up with the same contents on our repositories.</p> - <p>Changes flow between repositories by - <i>push</i> and + <p>Changes flow between repositories by + <i>push</i> and <i>pull</i> operations. In essence, it doesn't matter whether I push my changes to you, or you pull my changes from me; the net result is the same. However, in the case of Eclipse.org infrastructure, it's likely that a central Git repository will only be writable by Eclipse committers. Thus, if I contribute a fix, I can ask a committer to pull the fix from my repository, and then they (after reviewing, and optionally rebasing) can push the fix to the Eclipse.org repository. </p> <p>The best part of a DVCS is that it takes care of all the paperwork for you. You don't need to use SVN-like <code>314:321</code> tags to remind you where you branched from; you don't even have to worry if you haven't updated recently. It all just works.</p> <dl> - <dd>☞ + <dd>☞ <b>Pulling and pushing in a DVCS like Git is trivial</b> </dd> </dl> <h2 id="Cloning_and_remotes">Cloning and remotes</h2> - <p>Where you can push (or pull) to is configured on a per (local) repository basis. Typically, if you clone an existing project, then a - <i>remote name</i> called - <i>origin</i> is automatically set up for you. For example, if you wanted to get hold of + <p>Where you can push (or pull) to is configured on a per (local) repository basis. Typically, if you clone an existing project, then a + <i>remote name</i> called + <i>origin</i> is automatically set up for you. For example, if you wanted to get hold of <a href="http://git.eclipse.org/cgit.cgi/babel/org.eclipse.babel.server.git/" target="egit_external"> org.eclipse.babel.server.git</a>, then you could do: </p> <pre>git clone git://git.eclipse.org/gitroot/babel/org.eclipse.babel.server.git @@ -267,47 +267,47 @@ <p>We can then keep up-to-date with what's happening on the remote server by executing a pull from the remote:</p> <pre>git pull origin </pre> - <p>...but we're not limited to one repository. Let's say we wanted to create a separate copy on + <p>...but we're not limited to one repository. Let's say we wanted to create a separate copy on <a href="http://www.github.com" target="egit_external">GitHub</a> for easy forking; we can do that by adding another remote Git URL and then pushing to that: </p> <pre>git remote add github http://github.com/alblue/babel.git git push github </pre> - <p>We can now use <code>git push</code> and <code>git pull</code> to move items between the two git repositories. By default, they both refer to the special-named + <p>We can now use <code>git push</code> and <code>git pull</code> to move items between the two git repositories. By default, they both refer to the special-named <i>origin</i>, but you can specify whatever remote to talk to on the command line. </p> <dl> - <dd>☞ + <dd>☞ <b>Origin is the name of the default remote, but you can have many remotes per repository.</b> </dd> </dl> <h2 id="Initialising.2C_committing_and_branching">Initialising, committing and branching</h2> <p>To create a new Git repository, the <code>git init</code> command is used. This creates an empty repository in the current directory. They can, but often don't, end with <code>.git</code> – typically it's only repositories pushed to remote servers that use the <code>.git</code> extension. As noted above, a Git repository should ideally only hold one or a few highly related/coupled projects.</p> <dl> - <dd>☞ + <dd>☞ <b>'git init' creates a fresh repository in the current directory</b> </dd> </dl> - <p>Git allows you to commit files, much like any other VCS. Each commit may be a single file, or many files; and a message goes along with it. Unlike other VCS, Git has a separate concept of an + <p>Git allows you to commit files, much like any other VCS. Each commit may be a single file, or many files; and a message goes along with it. Unlike other VCS, Git has a separate concept of an <i>index</i>, which is a set of files that would be committed. You can think of it as an active changeset; as you're working on multiple files, you only want some changes to be committed as a unit. These files get <code>git add</code>ed to the index first, then <code>git commit</code>ted subsequently. (If you don't like this behaviour, there's a <code>git commit -a</code> option, which performs like CVS or SVN would.) </p> <dl> - <dd>☞ + <dd>☞ <b>'git add' is used to add files and track changes to files</b> </dd> - <dd>☞ + <dd>☞ <b>'git commit' is used to commit tracked files</b> </dd> </dl> <p>To create branches, you can use <code>git branch</code> (which creates, but does not switch to, the new branch) and <code>git checkout</code> (which switches to the new branch). A shorthand for new branches is <code>git checkout -b</code>, which creates-and-switches to a branch. At any point, <code>git branch</code> shows you a list of branches and marks the current one with a * next to the name.</p> <dl> - <dd>☞ + <dd>☞ <b>'git branch' is used to create and list branches</b> </dd> - <dd>☞ + <dd>☞ <b>'git checkout' is used to switch branches</b> </dd> - <dd>☞ + <dd>☞ <b>'git checkout -b' is used to create and then switch branches</b> </dd> </dl> @@ -352,7 +352,7 @@ $ git log --graph --oneline # Shows graph nodes (not much here) and change info * 0dd1f35 Added README.txt $ git checkout -b french 0dd1f35 # create and switch to a new branch 'french' Switched to a new branch 'french' -$ cat README.txt +$ cat README.txt Hello, world $ echo "Bonjour, tout le monde" &gt; README.txt $ git add README.txt # or commit -a @@ -388,18 +388,18 @@ Merge made by recursive. create mode 100644 index.html $ git log --graph --oneline * e974231 Merge branch 'web' into french -|\ +|\ | * d47e30c Added homepage * | 66a644c Ajouté README.txt -|/ +|/ * 0dd1f35 Added README.txt $ git checkout master $ git log --graph --oneline * e3de4de Merge branch 'web' -|\ +|\ | * d47e30c Added homepage * | 9b1939a Updated README.txt -|/ +|/ * 0dd1f35 Added README.txt $ (mkdir /tmp/other;cd /tmp/other;git init) # Could do this in other process Initialized empty Git repository in /tmp/other/.git/ @@ -449,27 +449,27 @@ Merge made by recursive. 1 files changed, 1 insertions(+), 0 deletions(-) $ git log --graph --oneline * 146932f Merge branch 'web' of /tmp/other -|\ +|\ | * 510621a Added Git Rocks * | e3de4de Merge branch 'web' -|\ \ -| |/ +|\ \ +| |/ | * d47e30c Added homepage * | 9b1939a Updated README.txt -|/ +|/ * 0dd1f35 Added README.txt </pre> <h2 id="Rebasing_and_fast-forwarding">Rebasing and fast-forwarding</h2> - <p>Often, you'll work on a branch for a while and then want to commit it to the repository. You can do this at any point, but it's considered good practice to + <p>Often, you'll work on a branch for a while and then want to commit it to the repository. You can do this at any point, but it's considered good practice to <i>rebase</i> your local branch before doing so. For example, you can end up with multiple branches in the log (with <code>git log --graph --oneline</code>): </p> <pre>* f0fde4e Merge change I11dc6200 -|\ +|\ | * 86dfb92 Mark the next version as 0.6 * | 0c8c04d Merge change I908e4c77 -|\ \ -| |/ -|/| +|\ \ +| |/ +|/| | * 843dc8f Add support for logAllRefUpdates configuration parameter * | 74ba6fc Remove TODO file and move to bugzilla * | ba7c6e8 Fix SUBMITTING_PATCHES to follow the Eclipse IP process @@ -478,20 +478,20 @@ $ git log --graph --oneline * | 8847865 Document protected members of RevObjectList * | a0a0ce8 Make it possible to clear a PlotCommitList * | 4a3870f Include description for missing bundle prereqs -|/ +|/ * 144b16d Cleanup MANIFEST.MF in JGit </pre> - <p>What happened here was that two branches split off from change <code>144b16d</code>, ultimately driving another branch at <code>74ba6fc</code> and a few merges (at <code>0c8c04d</code> and <code>f0fde4e</code>). (You can see a similar effect in + <p>What happened here was that two branches split off from change <code>144b16d</code>, ultimately driving another branch at <code>74ba6fc</code> and a few merges (at <code>0c8c04d</code> and <code>f0fde4e</code>). (You can see a similar effect in <a href="http://code.google.com/p/wave-protocol/source/list" target="egit_external">Google Code's Hg view of Wave Protocol</a>.) Ultimately, whilst the DVCS can handle these long-running branches and subsequent merges, humans tend to prefer to see fewer branches in the final repository. </p> - <p>A + <p>A <i>fast-forward</i> merge (in Git terms) is one which doesn't need any kind of merge operation. This usually happens when you are moving from an older branch to a newer branch on the same timeline; such as when updating to a newer version from a remote repository. These are essentially just moving the HEAD pointer further down the branch. </p> - <p>A + <p>A <i>rebase</i> is uprooting the branch from the original commit, and re-writing history as if it had been done from the current point in time. For example, in the above Git trace, <code>1441b16d</code> to <code>843dc8f</code> to <code>0c8c0fd</code> was only one commit off the main tree. Had the change been rebased off of <code>74ba6fc</code>, then we would have only seen a single timeline across those commits. It's generally considered good practice to rebase changes prior to pushing to a remote tree to avoid these kind of fan-outs, but it's not necessary to do so. Furthermore, the rebase operation changes the <code>sha1</code> hashes of your tree, which can affect those who have forked your repository. Best practice is to frequently rebase your changes in your own local repository, but once they've been made public (by pushing to a shared repository) to avoid rebasing further. </p> <dl> - <dd>☞ + <dd>☞ <b>Rebasing replants your tree; but do it on local branches only</b> </dd> </dl><hr/> diff --git a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Updating-This-Document.html index 27764e3110..8e0459fa14 100644 --- a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Updating-This-Document.html @@ -28,7 +28,7 @@ <h1 id="Updating_This_Document">Updating This Document</h1> <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - + <a href="http://wiki.eclipse.org/EGit/Git_For_Eclipse_Users" target="egit_external">http://wiki.eclipse.org/EGit/Git_For_Eclipse_Users</a> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/0.9.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/0.10.html index 92165d41b5..782b1cb8a7 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/0.9.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/0.10.html @@ -2,19 +2,19 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 0.9 New and Noteworthy</title> + <title>EGit 0.10 New and Noteworthy</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">EGit 0.9 New and Noteworthy</th> + <th style="width: 100%" align="center" colspan="3">EGit 0.10 New and Noteworthy</th> </tr> <tr> <td style="width: 20%" align="left"></td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Improved-Merge-Support.html" title="Improved Merge Support"> + <a href="Rebase-Support.html" title="Rebase Support"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -22,25 +22,19 @@ <tr> <td style="width: 20%" align="left" valign="top"></td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Improved Merge Support</td> + <td style="width: 20%" align="right" valign="top">Rebase Support</td> </tr> </table><hr/> - <h1 id="Synchronize_View">Synchronize View</h1> - <p>The synchronize view (via - <b>Team->Synchronize...</b>) and changesets are now supported. - </p> - <p> - <img border="0" src="images/Egit-0.9-syncview.png"/> - </p> - <p>You can also perform synchronize operations (e.g., from a tag) from the - <b>Git Repositories</b> view. + <h1 id="Pull_Support">Pull Support</h1> + <p>EGit now supports + <a href="../../../EGit/User_Guide/Tasks.html#Pulling_New_Changes_from_Upstream_Repositories" title="EGit/User_Guide#Pulling_New_Changes_from_Upstream_Repositories">Pull</a> for branches which are configured to track remote branches. When local branches are created based on a remote tracking branch EGit will automatically establish a tracking relationship. </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"></td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Improved-Merge-Support.html" title="Improved Merge Support"> + <a href="Rebase-Support.html" title="Rebase Support"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -48,7 +42,7 @@ <tr> <td style="width: 20%" align="left" valign="top"></td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Improved Merge Support</td> + <td style="width: 20%" align="right" valign="top">Rebase Support</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Rename-Detection.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Auto-wrapping-Commit-Messages.html index ea9ddb46cf..cc85c8418f 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Rename-Detection.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Auto-wrapping-Commit-Messages.html @@ -2,62 +2,57 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - Rename Detection</title> + <title>EGit 0.10 New and Noteworthy - Auto-wrapping Commit Messages</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">Rename Detection</th> + <th style="width: 100%" align="center" colspan="3">Auto-wrapping Commit Messages</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="Improved-Persistency-Support.html" title="Improved Persistency Support"> + <a href="History-View-Enhancements.html" title="History View Enhancements"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="DirCacheCheckout.html" title="DirCacheCheckout"> + <a href="PDE-Build-Fetch-Factory.html" title="PDE Build Fetch Factory"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Improved Persistency Support</td> + <td style="width: 20%" align="left" valign="top">History View Enhancements</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">DirCacheCheckout</td> + <td style="width: 20%" align="right" valign="top">PDE Build Fetch Factory</td> </tr> </table><hr/> - <h1 id="Rename_Detection">Rename Detection</h1> - <p>JGit now supports rename detection. - - <br/> - See - <b>org.eclipse.jgit.diff.RenameDetector</b> and tests for examples. - </p><hr/> + <h1 id="Auto-wrapping_Commit_Messages">Auto-wrapping Commit Messages</h1> + <p>The EGit commit dialog can now auto-wrap the commit message.</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Improved-Persistency-Support.html" title="Improved Persistency Support"> + <a href="History-View-Enhancements.html" title="History View Enhancements"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> - <a href="DirCacheCheckout.html" title="DirCacheCheckout"> + <a href="PDE-Build-Fetch-Factory.html" title="PDE Build Fetch Factory"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Improved Persistency Support</td> + <td style="width: 20%" align="left" valign="top">History View Enhancements</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">DirCacheCheckout</td> + <td style="width: 20%" align="right" valign="top">PDE Build Fetch Factory</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Improved-Merge-Support.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Bugs-Closed.html index 46254e9135..82dd1195b7 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Improved-Merge-Support.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Bugs-Closed.html @@ -2,65 +2,59 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 0.9 New and Noteworthy - Improved Merge Support</title> + <title>EGit 0.10 New and Noteworthy - Bugs Closed</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">Improved Merge Support</th> + <th style="width: 100%" align="center" colspan="3">Bugs Closed</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> + <a href="PDE-Build-Fetch-Factory.html" title="PDE Build Fetch Factory"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="-gitignore-Support.html" title=".gitignore Support"> + <a href="Commits.html" title="Commits"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 0.9 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">PDE Build Fetch Factory</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">.gitignore Support</td> + <td style="width: 20%" align="right" valign="top">Commits</td> </tr> </table><hr/> - <h1 id="Improved_Merge_Support">Improved Merge Support</h1> - <p>In EGit 0.8 fast-forward merging was only supported. - - <br/> - Now, full resolve merge support is offered via - <b>Team->Merge...</b> - </p> + <h1 id="Bugs_Closed">Bugs Closed</h1> <p> - <img border="0" src="images/Egit-0.9-resolve-merge.png"/> + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfieldto=2010-12-15;query_format=advanced;chfield=bug_status;chfieldfrom=2010-09-23;bug_status=RESOLVED;bug_status=CLOSED;resolution=FIXED;classification=Technology;product=EGit" target="egit_external">74 EGit Bugs</a> have been closed since 0.9 </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> + <a href="PDE-Build-Fetch-Factory.html" title="PDE Build Fetch Factory"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> - <img alt="EGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> - <a href="-gitignore-Support.html" title=".gitignore Support"> + <a href="Commits.html" title="Commits"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 0.9 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">PDE Build Fetch Factory</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">.gitignore Support</td> + <td style="width: 20%" align="right" valign="top">Commits</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Streaming-large-Objects.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Cherry-pick-Support.html index acb89c119a..74f376cff6 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Streaming-large-Objects.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Cherry-pick-Support.html @@ -2,57 +2,62 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - Streaming large Objects</title> + <title>EGit 0.10 New and Noteworthy - Cherry-pick Support</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">Streaming large Objects</th> + <th style="width: 100%" align="center" colspan="3">Cherry-pick Support</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="Resolve-Merge-Strategy.html" title="Resolve Merge Strategy"> + <a href="Rebase-Support.html" title="Rebase Support"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Delta-pack-generation.html" title="Delta pack generation"> + <a href="Merge-Tool.html" title="Merge Tool"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Resolve Merge Strategy</td> + <td style="width: 20%" align="left" valign="top">Rebase Support</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Delta pack generation</td> + <td style="width: 20%" align="right" valign="top">Merge Tool</td> </tr> </table><hr/> - <h1 id="Streaming_large_Objects">Streaming large Objects</h1> - <p>JGit now has support for streaming large loose and packed objects.</p><hr/> + <h1 id="Cherry-pick_Support">Cherry-pick Support</h1> + <p>EGit now supports + <a href="../../../EGit/User_Guide/Tasks.html#Cherry_Picking" title="EGit/User_Guide#Cherry_Picking">Cherry-pick</a> + </p> + <p> + <img border="0" src="images/CherryPick1.png"/> + </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Resolve-Merge-Strategy.html" title="Resolve Merge Strategy"> + <a href="Rebase-Support.html" title="Rebase Support"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> - <a href="Delta-pack-generation.html" title="Delta pack generation"> + <a href="Merge-Tool.html" title="Merge Tool"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Resolve Merge Strategy</td> + <td style="width: 20%" align="left" valign="top">Rebase Support</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Delta pack generation</td> + <td style="width: 20%" align="right" valign="top">Merge Tool</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Commits.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Commits.html index d13b6a7e0d..3da54babcb 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Commits.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Commits.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - Commits</title> + <title>EGit 0.10 New and Noteworthy - Commits</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="Delta-pack-generation.html" title="Delta pack generation"> + <a href="Bugs-Closed.html" title="Bugs Closed"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,26 +24,25 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Delta pack generation</td> + <td style="width: 20%" align="left" valign="top">Bugs Closed</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> </table><hr/> <h1 id="Commits">Commits</h1> <p> - <a href="http://egit.eclipse.org/w/?p=jgit.git;a=shortlog;h=v0.9.1;hp=v0.8.4;opt=--no-merges" target="egit_external">0.9.1 Changelog in gitweb</a> - </p> - <p>There were 347 commits total!</p><hr/> + <a href="http://egit.eclipse.org/w/?p=egit.git;a=shortlog;h=stable-0.10;hp=v0.9.3;opt=--no-merges" target="egit_external">EGit 0.10 - commits in gitweb</a> + </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Delta-pack-generation.html" title="Delta pack generation"> + <a href="Bugs-Closed.html" title="Bugs Closed"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -53,7 +52,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Delta pack generation</td> + <td style="width: 20%" align="left" valign="top">Bugs Closed</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/History-View-Improvements.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/HTTP-Authentication.html index a4c32c6b58..018e5a6fe4 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/History-View-Improvements.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/HTTP-Authentication.html @@ -2,17 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 0.9 New and Noteworthy - History View Improvements</title> + <title>EGit 0.10 New and Noteworthy - HTTP Authentication</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">History View Improvements</th> + <th style="width: 100%" align="center" colspan="3">HTTP Authentication</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="-gitignore-Support.html" title=".gitignore Support"> + <a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,26 +24,25 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">.gitignore Support</td> + <td style="width: 20%" align="left" valign="top">Synchronize View - Local Changes in Changeset Mode</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Repositories View Improvements</td> </tr> </table><hr/> - <h1 id="History_View_Improvements">History View Improvements</h1> - <p>The history view had its usability improved. Furthermore, it now allows checkout and branch from history items.</p> - <p> - <img border="0" src="images/Egit-0.9-historyview.png"/> - </p><hr/> + <h1 id="HTTP_Authentication">HTTP Authentication</h1> + <p>EGit now supports HTTP basic and digest authentication. This helps users sitting behind firewalls + which often block <code>git:</code> and <code>ssh:</code> traffic. + User credentials can be optionally stored in the Eclipse Secure Store.</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="-gitignore-Support.html" title=".gitignore Support"> + <a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> - <img alt="EGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -53,7 +52,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">.gitignore Support</td> + <td style="width: 20%" align="left" valign="top">Synchronize View - Local Changes in Changeset Mode</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Repositories View Improvements</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Git-Configuration-Editor.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/History-View-Enhancements.html index b9669b1ede..6bcfaae77d 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Git-Configuration-Editor.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/History-View-Enhancements.html @@ -2,13 +2,13 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 0.9 New and Noteworthy - Git Configuration Editor</title> + <title>EGit 0.10 New and Noteworthy - History View Enhancements</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">Git Configuration Editor</th> + <th style="width: 100%" align="center" colspan="3">History View Enhancements</th> </tr> <tr> <td style="width: 20%" align="left"> @@ -18,7 +18,7 @@ </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Commits.html" title="Commits"> + <a href="Auto-wrapping-Commit-Messages.html" title="Auto-wrapping Commit Messages"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -26,17 +26,16 @@ <tr> <td style="width: 20%" align="left" valign="top">Repositories View Improvements</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Commits</td> + <td style="width: 20%" align="right" valign="top">Auto-wrapping Commit Messages</td> </tr> </table><hr/> - <h1 id="Git_Configuration_Editor">Git Configuration Editor</h1> - <p>EGit now provides an editor to edit the global git configuration</p> - <p> - <img border="0" src="images/EGit-0.9-global-git-configuration.png"/> + <h1 id="History_View_Enhancements">History View Enhancements</h1> + <p>The History View coding has been cleaned up, this yields some performance improvements. + + <br/>Also some menu actions have been added on the commit list's context menu. </p> - <p>and the repository-specific git configuration</p> <p> - <img border="0" src="images/EGit-0.9-git-repo-configuration.png"/> + <img border="0" src="images/Egit-0.10-history-commitmenu.png"/> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -46,12 +45,12 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> - <img alt="EGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> - <a href="Commits.html" title="Commits"> + <a href="Auto-wrapping-Commit-Messages.html" title="Auto-wrapping Commit Messages"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -59,7 +58,7 @@ <tr> <td style="width: 20%" align="left" valign="top">Repositories View Improvements</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Commits</td> + <td style="width: 20%" align="right" valign="top">Auto-wrapping Commit Messages</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html new file mode 100644 index 0000000000..a44a6b33f7 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html @@ -0,0 +1,64 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>EGit 0.10 New and Noteworthy - Merge Tool</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">Merge Tool</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Cherry-pick-Support.html" title="Cherry-pick Support"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Cherry-pick Support</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Synchronize View - Local Changes in Changeset Mode</td> + </tr> + </table><hr/> + <h1 id="Merge_Tool">Merge Tool</h1> + <p>EGit now supports a + <a href="../../../EGit/User_Guide/Tasks.html#Using_Merge_Tool" title="EGit/User_Guide#Using_Merge_Tool">visual merge tool</a> to better support resolving conflicts detected during merge, rebase or cherry-pick + </p> + <p> + <img border="0" src="images/Egit-0.10-merge-tool.png"/> + </p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Cherry-pick-Support.html" title="Cherry-pick Support"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Cherry-pick Support</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Synchronize View - Local Changes in Changeset Mode</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/-gitignore-Support.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/PDE-Build-Fetch-Factory.html index 6098302612..3f473d3735 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/-gitignore-Support.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/PDE-Build-Fetch-Factory.html @@ -2,57 +2,59 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 0.9 New and Noteworthy - .gitignore Support</title> + <title>EGit 0.10 New and Noteworthy - PDE Build Fetch Factory</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">.gitignore Support</th> + <th style="width: 100%" align="center" colspan="3">PDE Build Fetch Factory</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="Improved-Merge-Support.html" title="Improved Merge Support"> + <a href="Auto-wrapping-Commit-Messages.html" title="Auto-wrapping Commit Messages"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="History-View-Improvements.html" title="History View Improvements"> + <a href="Bugs-Closed.html" title="Bugs Closed"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Improved Merge Support</td> + <td style="width: 20%" align="left" valign="top">Auto-wrapping Commit Messages</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">History View Improvements</td> + <td style="width: 20%" align="right" valign="top">Bugs Closed</td> </tr> </table><hr/> - <h1 id=".gitignore_Support">.gitignore Support</h1> - <p>EGit now respects .gitignore entries</p><hr/> + <h1 id="PDE_Build_Fetch_Factory">PDE Build Fetch Factory</h1> + <p>In the + <b>org.eclipse.egit.fetchfactory</b> plug-in TODO + </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Improved-Merge-Support.html" title="Improved Merge Support"> + <a href="Auto-wrapping-Commit-Messages.html" title="Auto-wrapping Commit Messages"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> - <img alt="EGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> - <a href="History-View-Improvements.html" title="History View Improvements"> + <a href="Bugs-Closed.html" title="Bugs Closed"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Improved Merge Support</td> + <td style="width: 20%" align="left" valign="top">Auto-wrapping Commit Messages</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">History View Improvements</td> + <td style="width: 20%" align="right" valign="top">Bugs Closed</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html new file mode 100644 index 0000000000..e143367fca --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html @@ -0,0 +1,68 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>EGit 0.10 New and Noteworthy - Rebase Support</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">Rebase Support</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Cherry-pick-Support.html" title="Cherry-pick Support"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">EGit 0.10 New and Noteworthy</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Cherry-pick Support</td> + </tr> + </table><hr/> + <h1 id="Rebase_Support">Rebase Support</h1> + <p>EGit now supports + <a href="../../../EGit/User_Guide/Tasks.html#Rebasing" title="EGit/User_Guide#Rebasing">Rebase</a> with options to abort, skip, and continue when rebase finds conflicts . + </p> + <p> + <img border="0" src="images/EGit-0.10-StartRebaseFromRepoView.png"/> + </p> + <p>When conflicts are detected during rebase the following dialog presents the options how to proceed</p> + <p> + <img border="0" src="images/EGit-0.10-RebaseConflictDialog.png"/> + </p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Cherry-pick-Support.html" title="Cherry-pick Support"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">EGit 0.10 New and Noteworthy</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Cherry-pick Support</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Repositories-View-Improvements.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html index 2ce84b400c..7391d87753 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Repositories-View-Improvements.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 0.9 New and Noteworthy - Repositories View Improvements</title> + <title>EGit 0.10 New and Noteworthy - Repositories View Improvements</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,54 +12,53 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="History-View-Improvements.html" title="History View Improvements"> + <a href="HTTP-Authentication.html" title="HTTP Authentication"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Git-Configuration-Editor.html" title="Git Configuration Editor"> + <a href="History-View-Enhancements.html" title="History View Enhancements"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">History View Improvements</td> + <td style="width: 20%" align="left" valign="top">HTTP Authentication</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Git Configuration Editor</td> + <td style="width: 20%" align="right" valign="top">History View Enhancements</td> </tr> </table><hr/> <h1 id="Repositories_View_Improvements">Repositories View Improvements</h1> - <p>The Repositories View was enhanced to support checkout, branch, merge, tag, synchronize operations and repository creation and deletion. + <h2 id="Drag_and_Drop_Support">Drag and Drop Support</h2> + <p>The repositories view now supports drag and drop. You can drag a folder or a list of folders from the file system into the Repositories View. If the folders are a valid Git repository or a direct parent of a .git folder, they will be added as a repository to the view.</p> + <h2 id="Support_for_References">Support for References</h2> + <p>The Repositories View now displays References like HEAD, FETCH_HEAD and provides corresponding checkout and create branch menu actions. - <br/> - Branches can now be displayed hierarchically or in a flat layout. - </p> - <p> - <img border="0" src="images/Egit-0.9-RepoViewMenu.png"/> + <img border="0" src="images/Egit-0.10-repoview-refsupport.png"/> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="History-View-Improvements.html" title="History View Improvements"> + <a href="HTTP-Authentication.html" title="HTTP Authentication"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> - <img alt="EGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> - <a href="Git-Configuration-Editor.html" title="Git Configuration Editor"> + <a href="History-View-Enhancements.html" title="History View Enhancements"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">History View Improvements</td> + <td style="width: 20%" align="left" valign="top">HTTP Authentication</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Git Configuration Editor</td> + <td style="width: 20%" align="right" valign="top">History View Enhancements</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.html new file mode 100644 index 0000000000..bc1c46b3a5 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.html @@ -0,0 +1,63 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>EGit 0.10 New and Noteworthy - Synchronize View - Local Changes in Changeset Mode</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">Synchronize View - Local Changes in Changeset Mode</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Merge-Tool.html" title="Merge Tool"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="HTTP-Authentication.html" title="HTTP Authentication"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Merge Tool</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">HTTP Authentication</td> + </tr> + </table><hr/> + <h1 id="Synchronize_View_-_Local_Changes_in_Changeset_Mode">Synchronize View - Local Changes in Changeset Mode</h1> + <p>EGit now shows current working tree and index status in changeset mode.</p> + <p> + <img border="0" src="images/EGit-0.10-working-tree-and-staged-changes-in-changeset.png"/> + </p> + <p>Those two nodes will only appear when "Include local uncommited changes in comparison" option was selected in synchronization dialog and when there are any staged or locally made changes.</p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Merge-Tool.html" title="Merge Tool"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="HTTP-Authentication.html" title="HTTP Authentication"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Merge Tool</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">HTTP Authentication</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Updating-This-Document.html index 0efed48873..db74b001b2 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Updating-This-Document.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - Updating This Document</title> + <title>EGit 0.10 New and Noteworthy - Updating This Document</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -28,8 +28,8 @@ <h1 id="Updating_This_Document">Updating This Document</h1> <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - - <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/0.9" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/0.9</a> + + <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.10" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.10</a> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -39,8 +39,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="EGit 0.10 New and Noteworthy"> + <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"></td> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/CherryPick1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/CherryPick1.png Binary files differnew file mode 100644 index 0000000000..0c25e444fe --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/CherryPick1.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-RebaseConflictDialog.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-RebaseConflictDialog.png Binary files differnew file mode 100644 index 0000000000..410497b659 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-RebaseConflictDialog.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-StartRebaseFromRepoView.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-StartRebaseFromRepoView.png Binary files differnew file mode 100644 index 0000000000..fd4b9b6449 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-StartRebaseFromRepoView.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-working-tree-and-staged-changes-in-changeset.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-working-tree-and-staged-changes-in-changeset.png Binary files differnew file mode 100644 index 0000000000..3c83260186 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-working-tree-and-staged-changes-in-changeset.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-history-commitmenu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-history-commitmenu.png Binary files differnew file mode 100644 index 0000000000..9bc97cc216 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-history-commitmenu.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-merge-tool.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-merge-tool.png Binary files differnew file mode 100644 index 0000000000..c2ec281716 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-merge-tool.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-repoview-refsupport.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-repoview-refsupport.png Binary files differnew file mode 100644 index 0000000000..a7228b701c --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-repoview-refsupport.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/EGit-0.9-git-repo-configuration.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/EGit-0.9-git-repo-configuration.png Binary files differdeleted file mode 100644 index d96e0b7022..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/EGit-0.9-git-repo-configuration.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/EGit-0.9-global-git-configuration.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/EGit-0.9-global-git-configuration.png Binary files differdeleted file mode 100644 index 0657fa12d1..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/EGit-0.9-global-git-configuration.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-RepoViewMenu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-RepoViewMenu.png Binary files differdeleted file mode 100644 index 09349c9faa..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-RepoViewMenu.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-historyview.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-historyview.png Binary files differdeleted file mode 100644 index 0e1e79ab4c..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-historyview.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-resolve-merge.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-resolve-merge.png Binary files differdeleted file mode 100644 index 496ff08ea7..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-resolve-merge.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-syncview.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-syncview.png Binary files differdeleted file mode 100644 index 1388704026..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/images/Egit-0.9-syncview.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Branching.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Branching.html deleted file mode 100644 index a446087815..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Branching.html +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Branching</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Branching</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Reverting-Changes.html" title="Reverting Changes"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Merging.html" title="Merging"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Reverting Changes</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Merging</td> - </tr> - </table><hr/> - <h1 id="Branching">Branching</h1> - <h2 id="Branching_in_the_Repositories_View">Branching in the Repositories View</h2> - <p>The Repositories View - <a href="Managing-Repositories.html#Branch_and_Tag_Support">supports</a> the following branching actions: - </p> - <ul> - <li> - <a href="Managing-Repositories.html#Check-out_of_Branches_and_Tags">Checkout of branches</a> - </li> - <li> - <a href="Managing-Repositories.html#Creation_and_Deletion_of_Branches">Creation and deletion of branches</a> - </li> - <li> - <a href="Managing-Repositories.html#Determining_the_Checked-out_Branch">Determining the checked out branch</a> - </li> - </ul> - <h2 id="Branching_Dialog">Branching Dialog</h2> - <p>To open the branching dialog click - - <br/> - - <b>Team > Branch...</b> - </p> - <p> - <img border="0" src="images/Egit-0.8-branch-dialog.png"/> - </p> - <h3 id="Creating_a_New_Local_Branch">Creating a New Local Branch</h3> - <ul> - <li>Select the branch your new branch should be based on</li> - <li>Click - <b>New Branch</b> - </li> - <li>Enter the branch name and click - <b>OK</b> - </li> - </ul> - <h3 id="Renaming_an_Existing_Branch">Renaming an Existing Branch</h3> - <ul> - <li>Select the branch you want to rename</li> - <li>Click - <b>Rename</b> - </li> - <li>Enter the new branch name and click - <b>OK</b> - </li> - </ul> - <h3 id="Checking_out_a_Branch">Checking out a Branch</h3> - <ul> - <li>Select the branch you want to check out</li> - <li>Click - <b>Checkout</b> - </li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Reverting-Changes.html" title="Reverting Changes"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Merging.html" title="Merging"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Reverting Changes</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Merging</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Committing-Changes.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Committing-Changes.html deleted file mode 100644 index 33a503d9e8..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Committing-Changes.html +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Committing Changes</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Committing Changes</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Inspecting-the-state-of-the-Repository.html" title="Inspecting the state of the Repository"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Reverting-Changes.html" title="Reverting Changes"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Inspecting the state of the Repository</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Reverting Changes</td> - </tr> - </table><hr/> - <h1 id="Committing_Changes">Committing Changes</h1> - <p>Modifications to a project which is version-controlled with Git are persistently recorded in the history through commits. In Git you modify your project until you have reached a state you are satisfied with and then you commit all these changes together to the repository in one single commit. </p> - <h2 id="Modifying_the_content">Modifying the content</h2> - <p>If you have a project which is already shared with Git then doing the actual modifications is easy: just modify or delete files either within Eclipse or even directly on the file-system. There is no need to "check-out" files or to tell Git in advance about these operations. Only when adding new files you should be cautious: new files which should be version-controlled have to be explicitly put under Git version control using the file's - <b>Track</b> menu action or immediately before a commit in the Commit dialog you may display untracked files by checking the - <b>Show untracked Files</b> checkbox and select them for inclusion in the commit. - </p> - <p> - <img border="0" src="images/EGit-AddFile.png"/> - </p> - <p>You can see for example in the Package Explorer View which files have been added (file icon marked with "+") and which files have been modified (file marked with ">" in front of the filename). For details see - <a href="Inspecting-the-state-of-the-Repository.html#Label_Decorations">Label Decorations</a>. - </p> - <p>Here is an example of one added and one modified file in the Package Explorer: </p> - <p> - <img border="0" src="images/EGit-AddedAndModifiedFiles.png"/> - </p> - <h2 id="Committing">Committing</h2> - <p>When you are satisfied with the state of the project you may commit your changes. To do that select - <b>Team > Commit...</b> from the context menu of a project or a file in the project. - </p> - <p> - <img border="0" src="images/EGit-Commit.png"/> - </p> - <p>It does not play a role whether you select this action on a certain file or on the whole project. The reason for this is that Git tracks all changes made to the whole repository capturing the modifications of each and every version-controlled file in that repository not regarding if these files reside in the same Eclipse project or not. </p> - <p>Once you have triggered the commit the following dialog will pop-up. </p> - <p> - <img border="0" src="images/EGit-CommitDialog2.png"/> - </p> - <h3 id="Commit_Message">Commit Message</h3> - <p> - <br/>In this dialog you specifiy the commit message describing the change. - </p> - <p>It is good practice to start the message with a short first line summarizing the change followed by a blank line and then the message body. In order to ensure that also git command line tools can format these messages nicely the lines shouldn't be formatted too wide. - - <br/>At the end a number of footer tags may follow : - </p> - <pre style="width: 40em;"> -Bug: 3176 -Reported-by: Joe Developer <joe@dev.org> -Signed-off-by: William Shakespeare <will.from@the.past> -</pre> - <p>The semantics of these tags are project or tool specific, e.g. - <a href="http://code.google.com/p/gerrit/" target="egit_external">Gerrit Code Review</a> uses the - <i>Change-Id:</i> footer to correlate the different patchsets of a change evolving during the review process towards the finally accepted patch. The - <i>Signed-off-by:</i> footer is used by many projects to create a formal track record of declarations that the signing authors contributed the changes under the project's license and IP rules. This way the IP provenance of a project's evolving code base can be captured on a technical level. - </p> - <p>Additionally this dialog controls which of the changes will be included in the commit. If you clear the checkbox in front of a file, the changes to this file will not be included in the commit. The local file in your eclipse workspace will still contain the modifications giving you the chance to commit these changes with a subsequent commit. This feature is often used to separate modifications done to a set of files into different commits. </p> - <p> - <b>One example:</b> Imagine since the last commit you have fixed a bug in A.java and you have added a new method to B.java. These two modifications are logically independent from each other hence you may want to commit them in two independant commits. In this case you initate the commit, deselect B.java from the set of committed files and specify a commit message describing only the bugfix in A.java. After a succesfull first commit you just call commit again and the upcoming dialog will present you the remaining changes in B.java. Now you specify a commit message describing the addition of the method and finish the second commit. - </p> - <p>New files you added to the project which have not been explicitly added to version control (see "Modifying the content") will be listed in the commit dialog if you select the checkbox "Show untracked Files". If you select the checkbox in front of these files in the list they will be added to the repository and committed once you press the commit button. Files which are excluded by the team ignore list or which are derived (e.g. the bin folder in java projects) will not be shown here. If you have no other changes in your repository than such untracked files the checkbox - <b>Show untracked Files</b> is selected by default. - </p> - <h3 id="Amending_Commits">Amending Commits</h3> - <p>When you commit you may specify that the current commit should "amend" the previous commit in the current branch. Your commit will then replace the previous commit. This feature is often use to correct wrong commits before they are published to other repositories. </p> - <p>Example: Imagine you have committed a change to a file containing a typo </p> - <p> - <img border="0" src="images/EGit-Typo.png"/> - </p> - <p>After you committed you detect the typo. In order to correct this typo and the corresponding commit you just fix the typo in the source file </p> - <p> - <img border="0" src="images/EGit-Corrected.png"/> - </p> - <p>Afterwards you trigger the commit and select the option - <b>Amend previous commit</b>. - </p> - <p> - <img border="0" src="images/EGit-AmendBringsOldCommitMessage.png"/> - </p> - <p>The commit message of your previous commit (the one which you want to replace) is filled into the "Commit Message" field. This gives you the chance not only to correct errors in the content of the version-controlled files but to also correct errors (e.g. typos) in the commit message describing your change. </p> - <p>As an alternative to amending you could just commit the corrected version as a subsequent commit. But the first commit containing the typo is of no use to anybody else and in order not to clutter the history of your project with unneeded commits you may decide to use the amend feature. </p> - <p>Be aware that amending commits which are already published to other repositories may cause trouble. Once you have pushed a commit to a remote repository or your local repository was cloned by somebody else you should be very careful whith amending commits. In this case publishing a second commit which corrects the first one is probably a better solution. </p> - <h3 id="Signing_off_commits">Signing off commits</h3> - <p>Git gives you the chance to "sign off" commits. This adds a <tt>Signed-off-by: <Your Name and Email-Adress></tt> footer to the commit message. The purpose of this signed-off-by information is not defined by Git but by the team using Git. Some teams use this information to record who has reviewed a certain commit. Other teams use the signed-off information to record that a commiter agreed to certain standards/rules. E.g. you may have to sign-off your own commits to state that you have read and understood the license-specific rules of your project.</p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Inspecting-the-state-of-the-Repository.html" title="Inspecting the state of the Repository"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Reverting-Changes.html" title="Reverting Changes"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Inspecting the state of the Repository</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Reverting Changes</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Concepts.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Concepts.html index b39cd11d9b..9756708467 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Concepts.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Concepts.html @@ -32,7 +32,9 @@ <h1 id="Concepts">Concepts</h1> <p>Git is built on a few simple and very powerful ideas. Knowing them helps to understand more easily how git works.</p> <h2 id="Repository">Repository</h2> - <p>The Repository or Object Database stores all objects which make up the history of the project. All objects in this database are identified through a secure 20 byte SHA-1 hash of the object content. This has several advantages:</p> + <p>The Repository or Object Database stores all objects which make up the history of the project. All objects in this database are identified through a secure 20 byte + <a href="http://en.wikipedia.org/wiki/SHA-1" target="egit_external">SHA-1 hash</a> of the object content. This has several advantages: + </p> <ul> <li>comparing two objects boils down to comparing two SHA-1 hashes</li> <li>since object names are computed from the object content in the same way in every git repository the same object will be stored under the same name in all repositories which happen to contain this object</li> @@ -40,17 +42,28 @@ </ul> <p>Git has four object types :</p> <ul> - <li>A "Blob object" stores file content</li> - <li>A "Tree object" stores the directory structure and contains "Blob objects" and other "Tree objects" together with their file system names and modes</li> - <li>A "Commit object" represents a snapshot of the directory structure at the time of the commit and has links to its predecessor and successor "Commit objects" which form an acyclic graph of the repository revisions forming the repository history.</li> - <li>A "Tag object" is a symbolic named link to another repository object which contains the object name and type of the referenced object and optionally information about the one who created the tag and signing information.</li> + <li>A + <b>Blob object</b> stores file content + </li> + <li>A + <b>Tree object</b> stores the directory structure and contains + <b>Blob objects</b> and other + <b>Tree objects</b> together with their file system names and modes + </li> + <li>A + <b>Commit object</b> represents a snapshot of the directory structure at the time of the commit and has links to its predecessor and successor + <b>Commit objects</b> which form an acyclic graph of the repository revisions forming the repository history. + </li> + <li>A + <b>Tag object</b> is a symbolic named link to another repository object which contains the object name and type of the referenced object and optionally information about the one who created the tag and signing information. + </li> </ul> - <p>The object database is stored in the .git/objects directory. Objects are either stored as loose objects or in a pack format packing efficiently many objects into a single file to enable efficient storage and transport of objects.</p> + <p>The object database is stored in the <code>.git/objects</code> directory. Objects are either stored as loose objects or in a pack format efficiently packing many objects into a single file to enable efficient storage and transport of objects.</p> <p> <b>Trust</b> </p> <p>Git provides a built-in trust chain through secure SHA-1 hashes which allow to verify if objects obtained from a (potentially untrusted) source are correct and have not been modified since they have been created.</p> - <p>If you get the signed tag for e.g. a project release which you can verify with e.g. the tagger's (e.g. the project lead) public signing key + <p>If you get the signed tag for e.g. a project release which you can verify with e.g. the tagger's (e.g. the project lead's) public signing key git ensures that the chain of trust covers the following:</p> <ul> <li>the signed tag identifies a commit object</li> @@ -60,8 +73,10 @@ </ul> <p>All the involved object names can be checked for consistency using the SHA-1 algorithm to ensure the correctness of the project revision and this way ensure that the entire history can be trusted.</p> <h2 id="Index">Index</h2> - <p>The index is a binary file stored in .git/index containing a sorted list of file names, permissions and the SHA-1 object name of blob objects. - It has the following important properties:</p> + <p>The + <b>Git Index</b> is a binary file stored in the <code>.git/index</code> directory containing a sorted list of file names, file modes, file meta data used to efficiently detect file modifications and the SHA-1 object name of blob objects. + </p> + <p>It has the following important properties:</p> <ul> <li>The index contains all information necessary to generate a single uniquely defined tree object. E.g. a commit operation generates this tree, stores it in the object database and associates it with the commit.</li> <li>The index enables fast comparison of the tree it defines with the current working directory. This is achieved by storing additional meta data about the involved files in the index data.</li> @@ -71,35 +86,40 @@ <p>The working directory is the directory used to modify files for the next commit. By default it is located one level above the .git directory. Making a new commit involves typically the following steps :</p> <ul> - <li>Checkout the branch the new commit shall be based on, this changes the working directory so that it reflects the HEAD revision of the branch.</li> + <li>Checkout the branch the new commit shall be based on, this changes the working directory so that it reflects the + <i>HEAD</i> revision of the branch. + </li> <li>Do modifications in the working directory</li> - <li>Tell git about these modifications (add modified files). This transfers the modifications into the object database and prepares the tree to be committed in the index.</li> - <li>Commit the tree prepared in the index into the object database. The result is a new commit object and the HEAD of the current branch moves to the new commit.</li> + <li>Tell git about these modifications (add modified files). This transfers the modified file contents into the object database and prepares the tree to be committed in the index.</li> + <li>Commit the tree prepared in the index into the object database. </li> + <li>The result is a new commit object and the + <i>HEAD</i> of the current branch moves to the new commit. + </li> </ul> <h2 id="Recording_Changes_in_the_Repository">Recording Changes in the Repository</h2> <p>You start from a fresh checkout of a branch of a local repository. You want to do some changes and record snapshots of these changes in the repository whenever you reach a state of your changes you want to record.</p> - <p>Each file in the working directory can either be - <i>tracked</i> or - <i>untracked</i>. + <p>Each file in the working directory can either be + <i>tracked</i> or + <i>untracked</i>. </p> <ul> - <li>Tracked files are those which were in the last snapshot or files which have been newly staged into the - <i>index</i>. They can be - <i>unmodified</i>, - <i>modified</i>, or + <li>Tracked files are those which were in the last snapshot or files which have been newly staged into the + <i>index</i>. They can be + <i>unmodified</i>, + <i>modified</i>, or <i>staged</i>. </li> - <li>Untracked files are all other files which were not in the last snapshot and have not been added to the + <li>Untracked files are all other files which were not in the last snapshot and have not been added to the <i>index</i>. </li> </ul> - <p>When you first clone a repository all files in the working directory will be - <i>tracked</i> and + <p>When you first clone a repository all files in the working directory will be + <i>tracked</i> and <i>unmodified</i> since they have been freshly checked out and you didn't start editing them yet. </p> - <p>As you edit files git will recognize they are + <p>As you edit files git will recognize they are <i>modified</i> since you have modified them since the last commit. - You + You <i>stage</i> the modified files into the index and then commit the staged changes and the cycle repeats. </p> <p>This lifecycle is illustrated here</p> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Creating-Repositories.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Creating-Repositories.html deleted file mode 100644 index fcfed682a5..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Creating-Repositories.html +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Creating Repositories</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Creating Repositories</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Perspective-Views-and-Menus.html" title="Perspective, Views and Menus"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Starting-from-existing-Git-Repositories.html" title="Starting from existing Git Repositories"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Perspective, Views and Menus</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Starting from existing Git Repositories</td> - </tr> - </table><hr/> - <h1 id="Creating_Repositories">Creating Repositories</h1> - <h2 id="Creating_a_new_empty_Git_Repository">Creating a new empty Git Repository</h2> - <p>This is currently not possible with EGit. You have to create a project first and to share it afterwards. The Share Project Wizard supports creation of Git repositories (see - <a href="http://wiki.eclipse.org/EGit/User_Guide/Sharing#Adding_a_project_to_version_control" title="EGit/User Guide/Sharing#Adding_a_project_to_version_control" target="egit_external">Adding a project to version control</a>). - </p> - <h2 id="Creating_a_Git_Repository_for_multiple_Projects">Creating a Git Repository for multiple Projects</h2> - <p>You may first create all projects under a common directory and then create a common repository for all projects in one go: </p> - <ul> - <li>create the Eclipse projects e.g. a, b, c under a common directory e.g. <span style="font-family:monospace;">/repos/examples/</span> </li> - <li>select all projects a, b, c - from context menu click - <b>Team > Share Project > Git</b> - </li> - <li>press - <b>Next</b> - </li> - <li>select all projects a, b, c </li> - <li>the wizard automatically moves up the default repository location to the parent folder <span style="font-family:monospace;">/repos/examples/</span> since multiple projects have been selected </li> - <li>click - <b>Create Repository</b> and click - <b>Finish</b> - </li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Perspective-Views-and-Menus.html" title="Perspective, Views and Menus"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Starting-from-existing-Git-Repositories.html" title="Starting from existing Git Repositories"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Perspective, Views and Menus</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Starting from existing Git Repositories</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html deleted file mode 100644 index a319aff316..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html +++ /dev/null @@ -1,299 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Inspecting the state of the Repository</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Inspecting the state of the Repository</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Working-with-remote-Repositories.html" title="Working with remote Repositories"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Committing-Changes.html" title="Committing Changes"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Working with remote Repositories</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Committing Changes</td> - </tr> - </table><hr/> - <h1 id="Inspecting_the_state_of_the_Repository">Inspecting the state of the Repository</h1> - <h2 id="Label_Decorations">Label Decorations</h2> - <p>Label decorations show Git specific information on resources under Git version control. They appear in all views showing model objects, like Package Explorer, Project Explorer, Navigator, Hierarchy View. </p> - <p>The Git label decorations can be switched on globally in the Preference Menu ( - <b>Window > Preferences</b>) under - <b>General > Appearance > Label Decorations</b>. - </p> - <p>More detailed settings can be done in the Preferences under - <b>Team > Git > Label Decorations</b>. - </p> - <p>There are two different types of label decorations: text decorations and icon decorations. </p> - <h3 id="Text_Decorations">Text Decorations</h3> - <p>Text decorations appear on the left or right side of the text label. They can be configured on the Preferences dialog under - <b>Team > Git > Label Decorations</b> on the tab - <b>Text Decorations</b>. For example, the default for a dirty resource is a <tt> - <b>></b></tt> on the left side of its name. - </p> - <p>These are the default settings: </p> - <p> - <img border="0" src="images/01-TextDecorations.png"/> - </p> - <p>For files and folders there are the variables <tt>"name"</tt>, <tt>"dirty"</tt> and <tt>"staged"</tt>. <tt>"Dirty"</tt> and <tt>"staged"</tt> are flags; if they are true, the text after the colon is displayed.</p> - <p>For projects there are the additional variables <tt>"repository"</tt> and <tt>"branch"</tt>. The <tt>"repository"</tt> variable displays the name of the repository.</p> - <p>The <tt>"branch"</tt> variable displays the name of the currently checked out branch. If no branch is checked out, the decoration shows the shortened name of the commit (first seven characters followed by ellipsis). If tags and/or remote branches are pointing to this commit, a "best guess" heuristic is applied to also show this information: tags take precedence over remote branches, if several tags apply, the newest one is displayed; if there are several remote branches or tags have no modification date, then alphabetic sorting is applied and the last one is shown. Example: the checked out commit <tt> - <b>e49f576...</b></tt> refers to tag <tt> - <b>v.0.7.1</b></tt> of repository <tt> - <b>egit</b></tt>: - <br/> - </p> - <p> - <img border="0" src="images/03-ExampleDecoration.png"/> - </p> - <h3 id="Icon_Decorations">Icon Decorations</h3> - <p>Icon decorations appear on the lower right corner of the icon displayed in front of the label. They can be configured on the Preferences dialog under - <b>Team > Git > Label Decorations</b> on the tab - <b>Icon Decorations</b>. - </p> - <p>These are the default decorations: </p> - <p> - <img border="0" src="images/02-IconDecorations.png"/> - </p> - <ul> - <li> - <b>dirty (folder)</b> - At least one file below the folder is dirty; that means that it has changes in the working tree that are neither in the index nor in the repository. - </li> - <li> - <b>tracked</b> - The resource is known to the Git repository and hence under version control. - </li> - <li> - <b>untracked</b> - The resource is not known to the Git repository and will not be version controlled until it is explicitly added. - </li> - <li> - <b>ignored</b> - The resource is ignored by the Git team provider. Here only the preference settings under - <b>Team > Ignored Resources</b> and the "derived" flag are relevant. Settings from <tt>.gitignore</tt> files are not yet taken into account. - </li> - <li> - <b>dirty</b> - The resource has changes in the working tree that are neither in the index nor in the repository. - </li> - <li> - <b>staged</b> - The resource has changes which have been added to the index. Note that adding changes to the index is currently possible only in the commit dialog via the context menu of a resource. - </li> - <li> - <b>partially-staged</b> - The resource has changes which are added to the index and additional changes in the working tree that neither reached the index nor have been committed to the repository. - </li> - <li> - <b>added</b> - The resource has not yet reached any commit in the repository but has been freshly added to the Git repository in order to be tracked in future. - </li> - <li> - <b>removed</b> - The resource is staged for removal from the Git repository. - </li> - <li> - <b>conflict</b> - A merge conflict exists for the file. - </li> - <li> - <b>assume-valid</b> - The resource has the "assume unchanged" flag. This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. Also see - <a href="Perspective-Views-and-Menus.html#Menu_Actions">Assume unchanged action</a>. - </li> - </ul> - <h2 id="History_View_2">History View</h2> - <p>The History View displays the the history of the files versioned in a Git repository. - To open the History View select - <b>Show In > History View</b> from the context menu on any resource under Git version control. - </p> - <p> - <img border="0" src="images/Egit-0.8-history-view.png"/> - </p> - <p>The top level pane is the commit graph displaying the commit log in reverse chronological order (newest commit on top).</p> - <p> - <img border="0" src="images/Egit-0.8-history-view-branches.png"/> - </p> - <ul> - <li>The tips of local branches are shown as green rectangles</li> - <li>The tips of remote branches are shown as grey rectangles</li> - <li>The local HEAD is shown as a white rectangle</li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-history-view-tag.png"/> - </p> - <ul> - <li>Tags are shown as yellow rectangles</li> - </ul> - <p>The lower two panes show the details of the selected commit. - In the lower right pane the files affected by the commit are listed.</p> - <p>The letter in the first column of this table describes the nature of the change for this file:</p> - <dl> - <dd> - <b>A</b> the file was added by the commit - </dd> - <dd> - <b>M</b> the file was modified by the commit - </dd> - <dd> - <b>D</b> the file was deleted by the commit - </dd> - </dl> - <p>In the lower left pane the commit message and some of its metadata and the git diff for the affected files are listed.</p> - <h3 id="History_View_Configuration">History View Configuration</h3> - <p>The toggle buttons in the the view toolbar control how the displayed commits are filtered with respect to the context set by the resource selected in e.g. the Navigator or Package Explorer view:</p> - <p> - <img border="0" src="images/Egit-0.8-history-view-toggle-none.png"/> - - <br/>If none of the toggle buttons is down the commit log is filtered to show only commits which affected the selected resource. - </p> - <p> - <img border="0" src="images/Egit-0.8-history-view-toggle-folder.png"/> - - <br/>If the right-most toggle is down the commit log is filtered to show all commits which affected any of the resources in the selected resource's parent folder. - </p> - <p> - <img border="0" src="images/Egit-0.8-history-view-toggle-project.png"/> - - <br/>If the middle toggle is down the commit log is filtered to show all commits which affected any of the resources in the selected resource's project. - </p> - <p> - <img border="0" src="images/Egit-0.8-history-view-toggle-repository.png"/> - - <br/>If the left toggle is down the commit log is not filtered and shows all commits reachable from the currently checked out branch. - </p> - <p>When the toggle button with the magnifying glass is down a search bar is displayed which allows to search for commits in the commit log: - <br/> - - <img border="0" src="images/Egit-0.8-history-view-toggle-magnifier.png"/> - </p> - <p>Depending on the setting in the drop-down list in the search bar the commit's title, comments, author or committer are searched. - - <br/> The found search hits are high-lighted in bold and the "next" and "previous" buttons allow to jump to the next or previous commit matching the search criteria. - <br/> - - <img border="0" src="images/Egit-0.8-history-view-search.png"/> - </p> - <p>The configuration drop-down menu in the view's toolbar allows to change formatting rules for the commit message and controls if the lower two panes of the History View should be displayed: - - <br/> - - <img border="0" src="images/Egit-0.8-history-view-configuration.png"/> - </p> - <h2 id="Commit_Dialog">Commit Dialog</h2> - <p>A summary of the status of all modified tracked files is displayed on the commit dialog. By double clicking a file the changes to be committed will be displayed in a compare dialog. As EGit currently always commits the content of the working tree (corresponding to git commit -a on the command line) the compare dialog will compare the working tree with the last commit.</p> - <h2 id="Comparing_Content">Comparing Content</h2> - <p>In daily work you will often want to see the changes between your last commit, the index, and the current working tree. </p> - <p> - <img border="0" src="images/03-CompareWith.png"/> - </p> - <p>Currently a compare dialog can only be opened for a single selected file. </p> - <h3 id="Compare_working_tree_with_last_commit">Compare working tree with last commit</h3> - <p>The difference between a file in the current working directory and in the last commit in the current branch can be viewed from the context menu "Compare With" -> "HEAD revision". This feature is also available in the Commit dialog. Double clicking on an entry in the Commit dialog opens a compare dialog. </p> - <h3 id="Comparing_Working_Tree_with_Index">Comparing Working Tree with Index</h3> - <p>The difference between a file in the current working directory and in the index can be viewed from the context menu - <b>Compare With > Git Index</b>. - </p> - <h3 id="Comparing_Working_Tree_with_Any_Commit">Comparing Working Tree with Any Commit</h3> - <ul> - <li>Select a file in the package explorer </li> - <li>from the context menu select - <b>Show in > History</b> or - <b>Compare With > History...</b> - </li> - <li>in the commit graph select a commit </li> - <li>from the context menu select - <b>Compare with working tree</b> - </li> - <li>this will open a compare dialog showing the changes between the selected commit and the current working tree</li> - </ul> - <h3 id="Comparing_Two_Commits_with_Each_Other">Comparing Two Commits with Each Other</h3> - <ul> - <li>Select a file in the package explorer </li> - <li>from the context menu select - <b>Show in > History</b> or - <b>Compare With > History...</b> - </li> - <li>in the commit graph select two commits </li> - <li>from the context menu select - <b>Compare with each other</b> - </li> - <li>this will open a compare dialog showing the changes between the two selected commits</li> - </ul> - <h3 id="Comparing_Index_with_HEAD_or_Any_Other_Commit">Comparing Index with HEAD or Any Other Commit</h3> - <p>This feature is not implemented yet.</p> - <h2 id="Quickdiff">Quickdiff</h2> - <p>Instead of using a compare editor you can enable quick diff support and see the changes within the text editor. - - <br/>This feature can be enabled via the - <b>General > Editors > Text Editors > Quick Diff</b> preference page: - </p> - <p> - <img border="0" src="images/04-QuickDiffPreferences.png"/> - </p> - <p>The difference annotation will then be displayed on the left hand side of the editor: </p> - <p> - <img border="0" src="images/05-QuickDiffInEditor.png"/> - </p> - <p>If you move your mouse over the annotation you see the content of the version you are comparing to: </p> - <p> - <img border="0" src="images/06-QuickDiffInEditorPopup.png"/> - </p> - <p>Per default, the comparison is against the HEAD. You can determine the version you are comparing to, the so-called quickdiff baseline, from the context menu of a commit in the history view ( - <b>Show in > History</b>). There are three menu entries: - </p> - <ul> - <li> - <b>Quick Diff -> Reset baseline to first parent of HEAD</b> - Compare against the first commit before HEAD. - </li> - <li> - <b>Quick Diff -> Reset baseline to HEAD</b> - Compare against HEAD. - </li> - <li> - <b>Quick Diff -> Set as baseline</b> - Compare against the selected commit - </li> - </ul> - <h2 id="View_Diff_for_a_Commit">View Diff for a Commit</h2> - <p>To display the diff for a given commit </p> - <ul> - <li>from context menu in package explorer select - <b>Team > Show in Resource History</b> - </li> - <li>select the commit you want to inspect </li> - <li>the history view will display the diff in the lower left pane</li> - <li>selecting a file in the lower right pane will scroll to the corresponding file section of the diff</li> - </ul> - <p> - <img border="0" src="images/EGit-0.7-ViewDiffInResourceHistory.png"/> - </p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Working-with-remote-Repositories.html" title="Working with remote Repositories"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Committing-Changes.html" title="Committing Changes"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Working with remote Repositories</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Committing Changes</td> - </tr> - </table> - </body> -</html> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Managing-Repositories.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Managing-Repositories.html deleted file mode 100644 index 0ea3d446c8..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Managing-Repositories.html +++ /dev/null @@ -1,231 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Managing Repositories</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Managing Repositories</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Patches.html" title="Patches"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Updating-This-Document.html" title="Updating This Document"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Patches</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Updating This Document</td> - </tr> - </table><hr/> - <h1 id="Managing_Repositories">Managing Repositories</h1> - <p>The "Git Repositories View" is the primary UI element to facilitate working with multiple Repositories simultaneously (i.e. within one Eclipse Workspace).</p> - <p>This view can be opened using the menu path - - <br/> - - <b>Windows > Show View > Other... > Git > Git Repositories</b> - </p> - <p>It is also part of the "Git Repository Exploring" perspective available using menu path - - <br/> - - <b>Window > Open Perspective > Other... > Git Repository Exploring</b> - </p> - <p>If you already have projects in your workspace which are shared with a Git Repository, you can use - - <br/> - - <b>Show In... > Git Repositories</b> - </p> - <p>on any resource to open the view:</p> - <p> - <img border="0" src="images/RepoMgrShowIn.png"/> - </p> - <h2 id="Adding_Repositories_to_the_Git_Repositories_View">Adding Repositories to the Git Repositories View</h2> - <p>Initially, the Git Repositories View is empty. In order to add Repositories to it, there are several options:</p> - <ol> - <li>Cloning a Repository and having the cloned Repository added to the view automatically</li> - <li>Adding a Repository from the Local File System manually</li> - <li>Adding a Repository by pasting a Git Repository path to the view</li> - </ol> - <h3 id="Cloning_a_Repository_2">Cloning a Repository</h3> - <p>In order to clone a Repository, refer to - <a href="Starting-from-existing-Git-Repositories.html#Cloning_a_Repository">Cloning remote Repositories</a>. After a successful clone operation, the newly cloned Repository should appear in the Git Repositories View automatically. - </p> - <p>You can also use the - <b>Clone a Git Repository</b> button from the view's toolbar to start the Clone wizard: - </p> - <p> - <img border="0" src="images/RepoMgrCloneRepositoryIcon.png"/> - </p> - <p>Please refer to - <a href="Starting-from-existing-Git-Repositories.html#Cloning_a_Repository">Cloning remote Repositories</a> about how to use the wizard. - </p> - <h3 id="Adding_a_Repository_manually">Adding a Repository manually</h3> - <p>You can add a Repository from your local file system to the Git Repositories View without cloning it. This can be helpful if you are setting up a new Eclipse workspace and want to re-use your Git Repositories. Use the - <b>Add an existing Git Repository</b> button from the view's toolbar: - </p> - <p> - <img border="0" src="images/RepoMgrAddRepositoryIcon.png"/> - </p> - <p>A dialog will appear prompting you for a directory of your local file system. After selecting the correct directory, you can hit the - <b>Search</b> button to see a list of Git Repositories in this directory. You can then select some or all found Repositories and add them to the view using - <b>OK</b>: - </p> - <p> - <img border="0" src="images/RepoMgrSearchDialog.png"/> - </p> - <h3 id="Adding_a_Repository_using_copy_and_paste">Adding a Repository using copy and paste</h3> - <p>As a shortcut,it is also possible to just paste the local file system path of a Git Repository from the clipboard to this view. In order to do so, copy the path of a Git Repository (the path to the repository's .git folder) to the clipboard, then open the context menu on the view panel (i.e. not selecting a node):</p> - <p> - <img border="0" src="images/RepoMgrPasteRepositoryPath.png"/> - </p> - <p>or simply perform - <b>Edit > Paste</b> from the main menu (or the corresponding keyboard shortcut). If the clipboard content is not suitable, an error popup will be displayed, otherwise the added Repository should appear automatically. - </p> - <p>After the view has been populated with some Repositories, it should look like this:</p> - <p> - <img border="0" src="images/RepoMgrViewWithRepos.png"/> - </p> - <h2 id="Structure_of_the_Git_Repositories_View">Structure of the Git Repositories View</h2> - <p>The following screenshot shows the topmost two levels of the Git Repositories View:</p> - <p> - <img border="0" src="images/RepoMgrTopLevelNodes.png"/> - </p> - <p>The root node represents the Repository itself. The node text indicates the name of the Repository and it's location in the local file system. The "Branches" and "Tags" nodes allow browsing and manipulation of tags and branches. The "Symbolic References" node lists other references which are not branches or tags, most notably the "HEAD" symbolic reference.</p> - <p>The "Working directory" node displays the location and structure of the working directory on the local file system (only in case of a development, or non-bare Repository, for bare Repositories, this node is always a leaf).</p> - <p>Finally, the "Remotes" node allows browsing and manipulating the remote configurations used for Fetch and Push.</p> - <h2 id="Functions_of_the_Git_Repositories_View">Functions of the Git Repositories View</h2> - <h3 id="Project_Import">Project Import</h3> - <p>In order to work with the contents of a Git Repository, its files and folders must be imported into the Eclipse workspace in the form of projects. While the Git Clone wizard allows to do such imports directly after cloning, the Git Repositories View allows to trigger project imports independently of the clone operation.</p> - <p>The "Import Projects..." context menu is available on the "Repository" node as well as on any "Folder" node within the "Working Directory" node and the "Working Directory" node itself:</p> - <p> - <img border="0" src="images/RepoMgrImportNodes.png"/> - </p> - <p>The rationale for offering the - <b>Import Projects...</b> action on several nodes is that some of the wizards used for importing projects can take the file system directory into account, for example the - <b>Import Existing Projects</b> wizard. If the import is started from the "Repository" or the "Working Directory" node, the working directory of the repository is set as context, otherwise the directory corresponding to the currently selected "Folder" node. - </p> - <p>The details of project import are discussed elsewhere.</p> - <h3 id="Branch_and_Tag_Support">Branch and Tag Support</h3> - <p>The "Branches" node allows to create, browse, checkout and delete local and remote branches. The "Tags" node allows for browsing and checking out of tags. - For better readability, branches are organized in two sub-nodes for local and remote branches, respectively, and only the shortened names are displayed, e.g. instead of <tt>"refs/heads/master"</tt> you would find an entry <tt>"master"</tt> under the "Local Branches" node, instead of <tt>"refs/remotes/origin/master"</tt> the shortened name <tt>"origin/master"</tt> is displayed under the "Remote Branches" node. Similarly, tag names are shortened by omitting the <tt>"refs/tags/"</tt> prefix:</p> - <p> - <img border="0" src="images/RepoMgrBranchesAndTags.png"/> - </p> - <h4 id="Check-out_of_Branches_and_Tags">Check-out of Branches and Tags</h4> - <p>Branches and tags can be checked out by either double-clicking on the respective node or by selecting the corresponding context menu entry.</p> - <h4 id="Creation_and_Deletion_of_Branches">Creation and Deletion of Branches</h4> - <p>Local branches can be created using a simple wizard. After selecting the corresponding context menu entry (available on the "Branches", the "Local Branches", and on any "Branch" node), you are asked to enter a source branch and a name for the new branch. Depending on whether you have called the wizard from a "Branch" node, the source branch drop-down will be pre-selected with either the selected branch or the currently checked-out branch:</p> - <p> - <img border="0" src="images/RepoMgrCreateBranch.png"/> - </p> - <p>You can change the source branch using the drop-down. By default, the newly created branch will be checked out after creation. Deselect the corresponding checkbox on the wizard if you don't want this to happen.</p> - <p>Branch deletion is done using the corresponding context menu entry.</p> - <h4 id="Determining_the_Checked-out_Branch">Determining the Checked-out Branch</h4> - <p>There are two ways to determine which branch or tag is currently checked out: the checked out branch/tag node is decorated with a little check mark and the "HEAD" entry under the "Symbolic References" node shows the (full) name of the checked out branch:</p> - <p> - <img border="0" src="images/RepoMgrCheckedOutBranch.png"/> - </p> - <h4 id=".22Detached.22_HEAD">"Detached" HEAD</h4> - <p>If HEAD is "detached", i.e. is not pointing to the tip of a local branch but to a commit or tag, then none or several "checked-out" markers may appear in the tree, since any number of remote branch or tags may point to the currently checked out commit. The state you are in while your HEAD is detached is not recorded by any branch (which is natural --- you are not on any branch).</p> - <h3 id="Browsing_the_Working_Directory">Browsing the Working Directory</h3> - <p>The "Working Directory" node visualizes the local file system structure of the Git Repository. It is also possible to open a text editor on the files:</p> - <p> - <img border="0" src="images/RepoMgrOpenTextEditor.png"/> - </p> - <p>Also, on all file and folder nodes as well as on the "Repository" node, an option is offered to copy the (file-system specific) path to the clipboard. This is sometimes useful when the path is needed, for example to open a directory using a file browser or to copy and paste Repositories between view instances (see above about how to add Repositories to the view). The - <b>Copy to Clipboard</b> action is also available using - <b>Edit > Copy</b> (or the corresponding keyboard shortcut). - </p> - <h3 id="Repository_Configuration">Repository Configuration</h3> - <p>Integration with the generic "Properties" view in Eclipse allows to view and edit the Git Configuration (global and repository-specific configuration). If the "Properties" view is open, it is updated automatically when a "Repository" node is selected. For convenience, an - <b>Open Properties view</b> action is provided in the context menu: - </p> - <p> - <img border="0" src="images/RepoMgrPropertiesView.png"/> - </p> - <h3 id="Remote_Repositories">Remote Repositories</h3> - <p>The "Remotes" node allows for browsing and editing Remote configurations. Each Remote configuration has a name and either a Push Specification, a Fetch Specification, or both. If a "Remote Configuration" node or any of its children is selected, the - <b>Properties</b> view will show a summary of the Remote configuration. In this example: there is a Remote configuration named "origin" which only has a Fetch Specification, but no Push Specification: - </p> - <p> - <img border="0" src="images/RepoMgrRemoteConfig.png"/> - </p> - <p>Menu actions are provided to add, configure, and remove Remote configurations and Fetch and Push Specifications. </p> - <h4 id="Direct_Fetch_and_Push_Support">Direct Fetch and Push Support</h4> - <p>It is possible to execute fetch and push directly (i.e. without a wizard) on the respective "Fetch" and "Push" nodes:</p> - <p> - <img border="0" src="images/RepoMgrSimpleFetch.png"/> - </p> - <p>Note that the fetch or push operation will be executed immediately in an asynchronous job; on completion you will get a confirmation pop-up displaying the fetch result.</p> - <h4 id="Adding_a_Remote_Configuration">Adding a Remote Configuration</h4> - <p>This is done using a context menu action on the "Remotes" node. A wizard is started asking for the name of the new configuration and whether to configure Fetch, Push, or both:</p> - <p> - <img border="0" src="images/RepoMgrNewRemote.png"/> - </p> - <p>The details of Remote configuration are explained elsewhere. Upon completion, the new Remote configuration will be visible:</p> - <p> - <img border="0" src="images/RepoMgrRemoteCreated.png"/> - </p> - <h4 id="Changing_Remote_Configurations">Changing Remote Configurations</h4> - <p>It is also possible to add, remove, or change Fetch/Push Specifications for an existing Remote configuration using the context menu.</p> - <h2 id="Refresh">Refresh</h2> - <p>The view is auto-refreshed periodically. The - <b>Refresh</b> button in the toolbar allows to trigger an immediate refresh: - </p> - <p> - <img border="0" src="images/RepoMgrRefresh.png"/> - </p> - <h2 id="Link_with_Selection">Link with Selection</h2> - <p>If the - <b>Link with selection</b> toggle is enabled, the file or folder corresponding to the current workbench selection will be displayed automatically: - </p> - <p> - <img border="0" src="images/RepoMgrLinkWithSelection.png"/> - </p> - <h2 id="Bare_Repositories">Bare Repositories</h2> - <p>"Bare" Git Repositories (as opposed to "development" or "standard" Repositories) have no working directory by definition, so all actions related to the working directory (check-out, project import, browsing the working directory) are not available for such Repositories. The "Bare-ness" of a Repository is visualized on the "Working Directory" node, which is always a leaf:</p> - <p> - <img border="0" src="images/RepoMgrBareRepository.png"/> - </p> - <h2 id="Removing_Repositories_from_the_Git_Repositories_View">Removing Repositories from the Git Repositories View</h2> - <p>This is offered as a menu action on the "Repository" node. Note that this does not delete the Repository, but just removes the node from the view. If there are projects in the workspace which are located in the working directory of the Repository, the user will be prompted to confirm deletion of these projects from the Eclipse workspace.</p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Patches.html" title="Patches"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Updating-This-Document.html" title="Updating This Document"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Patches</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Updating This Document</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Merge.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Merge.html deleted file mode 100644 index 3666555a6f..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Merge.html +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Merge</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Merge</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Reverting-Changes.html" title="Reverting Changes"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Tags.html" title="Tags"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Reverting Changes</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Tags</td> - </tr> - </table><hr/> - <h1 id="Merge">Merge</h1> - <p>A merge incorporates changes from named commits (since the time their histories diverged from the current branch) into the current branch. </p> - <h2 id="Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</h2> - <p>Note: Egit currently supports only fast-forward merges (see below).</p> - <p>In the Package Explorer or Navigator, open the context menu on a project node. - Select Team ->Merge...</p> - <p>Now the merge dialog opens:</p> - <p> - <img border="0" src="images/MergeDialog.png"/> - </p> - <p>On the dialog, select a branch or a tag you want to merge with your current branch. After pressing the Merge button, - the following scenarios can occur:</p> - <ul> - <li>Already up to date: Your current branch points to a commit that has the selected branch or tag as predecessor. In this case nothing is changed.</li> - <li>Fast-forward: Your current branch points to a commit that is a predecessor of the selected branch or tag. In this case your branch is moved and points to the selected branch or tag; this new HEAD is checked out to the working tree. Fast-forward is very common when working with remote repositories: When a remote tracking branch is updated, the merge with the corresponding branch generally is a fast-forward. You can perform a pull by fetching the remote branch (e.g. origin/master) and merging it into the corresponding local branch (e.g. master).</li> - <li>Real merge: When neither of the conditions above apply egit triggers a merge of the commits. This is not implemented yet.</li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Reverting-Changes.html" title="Reverting Changes"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Tags.html" title="Tags"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Reverting Changes</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Tags</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Merging.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Merging.html deleted file mode 100644 index e539e6b6b1..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Merging.html +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Merging</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Merging</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Branching.html" title="Branching"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Tagging.html" title="Tagging"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Branching</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Tagging</td> - </tr> - </table><hr/> - <h1 id="Merging">Merging</h1> - <p>A merge incorporates changes from named commits (since the time their histories diverged from the current branch) into the current branch. </p> - <h2 id="Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</h2> - <p>Note: Egit currently supports only fast-forward merges (see below).</p> - <p>In the Package Explorer or Navigator, open the context menu on a project node. - Select - <b>Team > Merge...</b> - </p> - <p>Now the merge dialog opens:</p> - <p> - <img border="0" src="images/MergeDialog.png"/> - </p> - <p>On the dialog, select a branch or a tag you want to merge with your current branch. After pressing the Merge button, - the following scenarios can occur:</p> - <ul> - <li>Already up to date: Your current branch points to a commit that has the selected branch or tag as predecessor. In this case nothing is changed.</li> - <li>Fast-forward: Your current branch points to a commit that is a predecessor of the selected branch or tag. In this case your branch is moved and points to the selected branch or tag; this new HEAD is checked out to the working tree. Fast-forward is very common when working with remote repositories: When a remote tracking branch is updated, the merge with the corresponding branch generally is a fast-forward. You can perform a pull by fetching the remote branch (e.g. origin/master) and merging it into the corresponding local branch (e.g. master).</li> - <li>Real merge: When neither of the conditions above apply egit triggers a merge of the commits. This is not implemented yet.</li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Branching.html" title="Branching"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Tagging.html" title="Tagging"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Branching</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Tagging</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Patches.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Patches.html deleted file mode 100644 index 055d39dbd4..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Patches.html +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Patches</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Patches</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Tagging.html" title="Tagging"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Managing-Repositories.html" title="Managing Repositories"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Tagging</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Managing Repositories</td> - </tr> - </table><hr/> - <h1 id="Patches">Patches</h1> - <h2 id="Creating_Patches">Creating Patches</h2> - <p>"A patch is a piece of software designed to fix problems with, or update a computer program or its supporting data" (wikipedia). A patch file contains a description of changes of a set of resources which can be automatically applied to another eclipse workspace or git repository.</p> - <p>The patch formats used by eclipse ( - <b>Team > Apply Patch</b>) and by git (<tt> - <b>git apply</b></tt> or <tt> - <b>git am</b></tt> on the command line) are different. It is possible to create both types of a patch in EGit. - </p> - <h3 id="Create_a_Patch_from_a_Commit">Create a Patch from a Commit</h3> - <p>This is the most common use case for a distributed versioning system. A developer commits a change on a local feature or bugfix branch and wants to export this change into a patch file.</p> - <p>It can be done from the history view:</p> - <p> - <img border="0" src="images/PatchContextMenu.png"/> - </p> - <p>The patch file will contain the difference between the commit and its parent in the history view. Note that the filter of the history view applies also for patch creation.</p> - <h3 id="Patch_Wizard">Patch Wizard</h3> - <p>The Wizard consists of two pages. Page one lets you select the location of the patch:</p> - <p> - <img border="0" src="images/PatchWizardPage1.png"/> - </p> - <p>The name of the patch file is created from the first line of the commit message.</p> - <p>On the second page you can change the patch format. </p> - <p>Currently there is one check box: - <b>Export in git patch format</b>. - </p> - <ul> - <li>If you do not check it (this is the default) the patch can be applied with the eclipse - <b>Apply Patch...</b> wizard. The paths are relative to the eclipse projects and do not contain prefixes (like <tt> - <b>git format-patch --no-prefix</b></tt> on the git command line). - </li> - <li>If you check it the patch will look like the result of <tt> - <b>git format-patch --no-stat</b></tt> on the git command line. - </li> - </ul> - <h2 id="Applying_Patches">Applying Patches</h2> - <p>Currently it s not possible to apply patches in git format. It is possible to apply patches using the standard eclipse format using - <b>Team > Apply Patch...</b>. - </p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Tagging.html" title="Tagging"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Managing-Repositories.html" title="Managing Repositories"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Tagging</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Managing Repositories</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Perspective-Views-and-Menus.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Perspective-Views-and-Menus.html deleted file mode 100644 index d64636e05e..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Perspective-Views-and-Menus.html +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Perspective, Views and Menus</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Perspective, Views and Menus</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Creating-Repositories.html" title="Creating Repositories"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">EGit User Guide</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Creating Repositories</td> - </tr> - </table><hr/> - <h1 id="Perspective.2C_Views_and_Menus">Perspective, Views and Menus</h1> - <h2 id="Git_Perspective">Git Perspective</h2> - <p> - <b>Window > Open Perspective > Git Repository Exploring</b> opens the Git Repository Exploring perspective - </p> - <h2 id="Git_Repositories_View">Git Repositories View</h2> - <p> - <b>Window > Open View > Git > Git Repositories</b> opens the Git Repositories view which is explained in detail - <a href="Managing-Repositories.html#Managing_Repositories">here</a>. - </p> - <h2 id="History_View">History View</h2> - <p> - <b>Show In > History View</b> on the context menu of resources under git version control navigates to the - <a href="Perspective-Views-and-Menus.html#History_View">History View</a>. - </p> - <h2 id="Project_Context_Menu">Project Context Menu</h2> - <p>On project nodes in navigation views (Navigator, Package Explorer etc.) the following Git actions are available for projects shared with the Git team provider: - - <br/> - <img border="0" src="images/Egit-0.8-context-menu-project.png"/> - </p> - <h2 id="Resource_Context_Menu">Resource Context Menu</h2> - <p>On resource nodes (files and folders) in navigation views the following Git actions are available for projects shared with the Git team provider: - - <br/> - <img border="0" src="images/Egit-0.8-context-menu-resource.png"/> - </p> - <h2 id="Menu_Actions">Menu Actions</h2> - <ul> - <li> - <a href="Committing-Changes.html#Committing_Changes">Commit...</a> - </li> - <li> - <a href="Working-with-remote-Repositories.html#Pushing_to_other_Repositories">Push...</a> - </li> - <li> - <a href="Branching.html#Branching">Branch...</a> - </li> - <li> - <a href="Merging.html#Merging">Merge...</a> - </li> - <li> - <a href="Tagging.html#Tagging">Tag...</a> - </li> - <li> - <a href="Reverting-Changes.html#Resetting_your_current_HEAD">Reset...</a> - </li> - <li> - <b>Refresh</b>: Updates the Git index for the selected resources. Only tracked resources are updated. This will update the index timestamps with the file timestamps. See - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315306" target="egit_external">bug 315306</a>. - </li> - <li> - <a href="Patches.html#Applying_Patches">Apply Patch...</a> - </li> - <li> - <a href="Working-with-remote-Repositories.html#Fetching_from_other_Repositories">Fetch...</a> - </li> - <li> - <b>Ignore</b>: action to add files to .gitignore. - <b>Note:</b> EGit does not yet respect ignore settings stored in <tt>.gitignore</tt> files. - </li> - <li> - <b>Add</b>: adds changes present in the working tree to the git index, also known as staging changes. See - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315306" target="egit_external">bug 315306</a>. - </li> - <li> - <b>Assume unchanged</b>: Resources can be flagged "assume unchanged". This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. This setting can be switched on with the menu action - <b>Team > Assume unchanged</b> (or on the command line with <tt>git update-index --assume-unchanged</tt>). Currently it can only be switched back on the command line with <tt>git update-index --no-assume-unchanged</tt>. - </li> - <li> - <b>Untrack</b>: Removes resources from git version control. If you want to delete the resource from the working tree click also - <b>Delete</b> in the resource's context menu. - </li> - <li> - <b>Track</b>: puts newly created resources under git version control. Git does not automatically start tracking resources. See - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315306" target="egit_external">bug 315306</a>. - </li> - <li> - <b>Disconnect</b>: Disconnects the attached git team provider from this project. - </li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Creating-Repositories.html" title="Creating Repositories"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">EGit User Guide</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Creating Repositories</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html index cd717b8f14..dc9a64d766 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html @@ -32,75 +32,183 @@ <h1 id="Reference">Reference</h1> <h2 id="Menus">Menus</h2> <h3 id="Project_Context_Menu">Project Context Menu</h3> - <p>On project nodes in navigation views (Navigator, Package Explorer etc.) the following Git actions are available for projects shared with the Git team provider: + <p>On project nodes in navigation views (Navigator, Package Explorer etc.) the following + Git actions are available for projects shared with the Git team provider: - <br/> - <img border="0" src="images/Egit-0.9-project-menu.png"/> + <br/> + <img border="0" src="images/Egit-0.10-project-menu.png"/> </p> <h3 id="Resource_Context_Menu">Resource Context Menu</h3> <p>On resource nodes (files and folders) in navigation views the following Git actions are available for projects shared with the Git team provider: + <br/> + <img border="0" src="images/Egit-0.10-resource-menu.png"/> + </p> + <h3 id="Repositories_View_Menus">Repositories View Menus</h3> + <p>In the Repositories View the menu depends on the node type which is selected + <br/> + + <img border="0" src="images/Egit-0.10-repoview.png"/> + </p> + <p>Menu on repository nodes: + <br/> + + <img border="0" src="images/Egit-0.10-repoview-repomenu.png"/> + </p> + <p>Menu on branche nodes: + <br/> + + <img border="0" src="images/Egit-0.10-repoview-branchmenu.png"/> + </p> + <p>Menu on tag nodes: + <br/> + + <img border="0" src="images/Egit-0.10-repoview-tagmenu.png"/> + </p> + <p>Menu on Reference nodes: + <br/> + + <img border="0" src="images/Egit-0.10-repoview-refmenu.png"/> + </p> + <p>Menu on Fetch Configuration nodes: + <br/> + + <img border="0" src="images/Egit-0.10-repoview-fetchmenu.png"/> + </p> + <p>Menu on Push Configuration nodes: + <br/> + + <img border="0" src="images/Egit-0.10-repoview-pushmenu.png"/> + </p> + <p>Menu on Working Tree nodes: + <br/> + + <img border="0" src="images/Egit-0.10-repoview-worktreemenu.png"/> + </p> + <h3 id="History_View_Menus">History View Menus</h3> + <p>Menu on entries in the History View's commit list <br/> - <img border="0" src="images/Egit-0.9-resource-menu.png"/> + + <img border="0" src="images/Egit-0.10-history-commitmenu.png"/> </p> <h3 id="Menu_Actions">Menu Actions</h3> <ul> <li> - <a href="Tasks.html#Committing_Changes">Commit...</a> + <a href="User-Guide.html#Track_Changes">Add</a> - + <ul> + <li>Add changes present in the working tree to the git index, also known as staging changes. </li> + <li>Put newly created resources under git version control (Git does not automatically start tracking resources).</li> + <li> + <a href="Tasks.html#Adding_conflict_resolution_to_the_git_index">Resolve conflicts</a>. + </li> + </ul> + </li> + <li> + <a href="Tasks.html#Applying_Patches">Apply Patch</a> - Apply a patch. </li> <li> - <a href="Tasks.html#Pushing_to_other_Repositories">Push...</a> + <b>Assume unchanged</b> - Resources can be flagged "assume unchanged". This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. This setting can be switched on with the menu action + <b>Team > Assume unchanged</b> and switched back with the menu action + <b>Team > No Assume unchanged</b>. </li> <li> - <a href="Tasks.html#Fetching_from_other_Repositories">Fetch From...</a> + <a href="Tasks.html#Branching">Branch</a>, + <a href="Reference.html#Create_Branch...">Create Branch</a> - Checkout a branch or create a branch. </li> <li> - <a href="Tasks.html#Comparing_with_Branches_.28Synchronize.29">Synchronize...</a> + <b>Change Credentials</b> - Change logon credentials of a Fetch or Push Specification, credentials are stored per URL in the Eclipse Secure Store. </li> <li> - <a href="Tasks.html#Merging">Merge...</a> + <b>Checkout</b> - Checkout a + <a href="Tasks.html#Check-out_of_Branches_and_Tags">Branch, Tag</a>, + <a href="Reference.html#Checkout">Commit</a> or Reference. </li> <li> - <a href="Tasks.html#Branching">Branch...</a> + <a href="Tasks.html#Cherry_Picking">Cherry-pick</a> - Cherry-pick a single commit onto the tip of the currently checked out branch. </li> <li> - <a href="Tasks.html#Tagging">Tag...</a> + <b>Clear Credentials</b> - Clear logon credentials of a Fetch or Push Specification, credentials are stored per URL in the Eclipse Secure Store. </li> <li> - <a href="Tasks.html#Resetting_your_current_HEAD">Reset...</a> + <a href="Tasks.html#Committing_Changes">Commit</a> - Commit changes. </li> <li> - <a href="Tasks.html#Applying_Patches">Apply Patch...</a> + <b>Delete Fetch</b> - Delete a Fetch Specification. </li> <li> - <b>Ignore</b>: action to add files to .gitignore. + <b>Delete Push</b> - Delete a Push Specification. </li> <li> - <b>Add</b>: - <ul> - <li>Adds changes present in the working tree to the git index, also known as staging changes. </li> - <li>Puts newly created resources under git version control (Git does not automatically start tracking resources).</li> - <li>Resolves conflicts.</li> - </ul> + <a href="Tasks.html#Direct_Fetch_and_Push_Support">Configure Fetch</a> - Configure a Fetch Specification. </li> <li> - <b>Assume unchanged</b>: Resources can be flagged "assume unchanged". This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. This setting can be switched on with the menu action - <b>Team > Assume unchanged</b> (or on the command line with <tt>git update-index --assume-unchanged</tt>). Currently it can only be switched back on the command line with <tt>git update-index --no-assume-unchanged</tt>. + <a href="Tasks.html#Direct_Fetch_and_Push_Support">Configure Push</a> - Configure a Push Specification. </li> <li> - <b>Untrack</b>: Removes resources from git version control. If you want to delete the resource from the working tree click also - <b>Delete</b> in the resource's context menu. + <a href="Tasks.html#Creation_and_Deletion_of_Branches">Delete Branch</a> - Delete a branch. + </li> + <li> + <a href="Tasks.html#Deleting_a_Repository">Delete Repository</a> - Delete a repository. + </li> + <li> + <b>Disconnect</b> - Disconnect the attached Git Team Provider from this project. The git repository still exists but is no longer integrated with Eclipse. + </li> + <li> + <a href="Tasks.html#Fetching_from_other_Repositories">Fetch From</a> - Fetch changes from remote repositories. + </li> + <li> + <a href="Reference.html#Git_Ignore">Ignore</a> - Add files to .gitignore so that git ignores them. + </li> + <li> + <a href="Tasks.html#Method_for_importing_Projects">Import Projects</a> - Import projects into the Eclipse workbench. + </li> + <li> + <a href="Tasks.html#Merging">Merge</a> - Merge branches. </li> <li> - <a href="Tasks.html#Managing_Repositories">Show in Repositories View</a> : shows the selected resource in the Repositories View. + <a href="Tasks.html#Using_Merge_Tool">Merge Tool</a> - Resolve conflicts using the Merge Tool. </li> <li> - <a href="Reference.html#History_View">Show in History</a>: shows the selected resource in the History View. + <a href="Tasks.html#Repository_Configuration">Open Properties View</a> - View and edit the repository configuration. </li> <li> - <b>Disconnect</b>: Disconnects the attached git team provider from this project. The git repository still exists but is no longer integrated with Eclipse. + <a href="Tasks.html#Pulling_New_Changes_from_Upstream_Repositories">Pull</a> - Pull changes from remote branch tracked by currently checked out local branch. + </li> + <li> + <a href="Tasks.html#Pushing_to_other_Repositories">Push</a> - Push changes to another repository. + </li> + <li> + <a href="Tasks.html#Rebasing">Rebase</a> - Rebase a branch onto another one. + </li> + <li> + <a href="Tasks.html#Removing_a_Repository_from_the_Repositories_View">Remove Repository</a> - Remove a repository from the Repositories View. + </li> + <li> + <a href="Tasks.html#Renaming_an_Existing_Branch">Rename Branch</a> - Rename a branch. + </li> + <li> + <a href="Tasks.html#Resetting_your_current_HEAD">Reset</a> - Reset the current HEAD, Index or Working Tree. + </li> + <li> + <a href="Reference.html#History_View">Show in History</a> - Show the selected resource in the History View. + </li> + <li> + <a href="Tasks.html#Managing_Repositories">Show in Repositories View</a> - Show the selected resource in the Repositories View. + </li> + <li> + <a href="Tasks.html#Comparing_with_Branches_.28Synchronize.29">Synchronize</a> - Synchronize local and remote branches with each other. + </li> + <li> + <a href="Tasks.html#Tagging">Tag</a> - Create, delete tags. + </li> + <li> + <b>Untrack</b> - Remove resources from git version control. If you want to delete the resource from the working tree click also + <b>Delete</b> in the resource's context menu. </li> </ul> + <p> + <br/> + </p> <h2 id="Git_Perspective_and_Views">Git Perspective and Views</h2> <h3 id="Git_Perspective">Git Perspective</h3> <p> @@ -108,7 +216,7 @@ </p> <h3 id="Git_Repositories_View">Git Repositories View</h3> <p> - <b>Window > Open View > Git > Git Repositories</b> opens the Git Repositories view which is explained in detail + <b>Window > Open View > Git > Git Repositories</b> opens the Git Repositories view which is explained in detail <a href="Tasks.html#Managing_Repositories">here</a>. </p> <h3 id="History_View">History View</h3> @@ -126,24 +234,24 @@ <h4 id="Opening_the_History_View">Opening the History View</h4> <p>The History view can be opened by </p> <ul> - <li>Right-clicking + <li>Right-clicking <b>Show In > History View</b> on any resource under Git version control in the explorer (not available in all Perspectives) </li> - <li>Right-clicking + <li>Right-clicking <b>Team > Show in History</b> on any resource under Git version control in the explorer </li> - <li>Clicking - <b>Window > Show View > Other...</b>, then + <li>Clicking + <b>Window > Show View > Other...</b>, then <b>Team > History</b> </li> </ul> - <p>Once the view is open, you can activate the + <p>Once the view is open, you can activate the <b>Link with Selection</b> button to keep the input of the view in sync with the selection in the explorer automatically. </p> <h4 id="Organization_of_the_History_View">Organization of the History View</h4> <p>The History view is organized in several panes: </p> <p> - <img border="0" src="images/Egit-0.9-history-view.png"/> + <img border="0" src="images/Egit-0.9-history-view.png"/> </p> <p>The upper pane is the Commit Graph displaying the commit log (or commit history) in reverse chronological order (newest commit on top). Below the commit graph, there are by default two panes: on the left side, the Revision Comment area, which shows the commit message and a textual Diff of the file or files in the commit, and on the right side, the Revision Detail area, which shows a table of the files that were changed by the commit.</p> <p>The first column of this table describes the nature of the change for each file:</p> @@ -159,8 +267,8 @@ </dd> </dl> <p>The content of the lower panes depends on the selection in the upper pane and is updated automatically when this selection changes.</p> - <p>Both lower panes can be switched on and and off separately by right-clicking anywhere in the upper pane and selecting - <b>Show Revision Comment</b> and + <p>Both lower panes can be switched on and and off separately by right-clicking anywhere in the upper pane and selecting + <b>Show Revision Comment</b> and <b>Show Revision Details</b>, respectively. </p> <p>Above the Commit Graph, the current input is visualized. The input is always a workspace resource, either a project, a folder, or a file. After the type of the input, the path is shown, followed by the name of the Repository containing the resource in square brackets.</p> @@ -183,27 +291,27 @@ There can be forks, which correspond to a branch operation, and joins, which correspond to a merge operation. In our example, there was a branch "experimental" created after the commit with branch "beforeSplit", and the same file was changed both in the "master" and in the "experimental" branch. The last commit is a merge commit where the content of the "experimental" branch was merged with the "master" branch.</p> <p>The exact change can be inspected by marking a commit and looking at the Revision Comment area. When scrolling down in the Revision Comment area, a textual diff for the changes will be visible, in our example it says that the content of Project1/f1/file1.txt was changed from "modified" to "modified in master". When selecting the next commit (which corresponds to the "experimental" branch), a similar diff would be displayed, saying that the content of that file was changed from "modified" to "modified in experimental". The newest commit is the result of merging "experimental" into "master". Accordingly, the new commit has two ancestors and the "master" and "experimental" lines are joined again.</p> <h5 id="Displaying_and_Comparing_versions_of_a_File">Displaying and Comparing versions of a File</h5> - <p>If the current input is already a file, right-clicking - <b>Open</b> on a commit will open an editor with the file content corresponding to the currently selected commit. If the file does not exist in the selected commit, an error message will be displayed. Clicking + <p>If the current input is already a file, right-clicking + <b>Open</b> on a commit will open an editor with the file content corresponding to the currently selected commit. If the file does not exist in the selected commit, an error message will be displayed. Clicking <b>Compare with working tree</b> will open a compare editor comparing the file content of the currently selected commit with the file content in the workspace. </p> <p> <img border="0" src="images/Egit-0.9-history-view-openAndCompare.png"/> </p> - <p>The - <b>Open</b> and - <b>Compare with working tree</b> actions can also be executed by double-clicking on a commit: if the "Compare Mode" toolbar button (see below) is down, - <b>Compare with working tree</b> will be executed, otherwise + <p>The + <b>Open</b> and + <b>Compare with working tree</b> actions can also be executed by double-clicking on a commit: if the "Compare Mode" toolbar button (see below) is down, + <b>Compare with working tree</b> will be executed, otherwise <b>Open</b>. </p> - <p>It is possible to compare the file contents of two commits by selecting the two commits and right-clicking on + <p>It is possible to compare the file contents of two commits by selecting the two commits and right-clicking on <b>Compare with Each Other</b>. </p> - <p>Furthermore, it is possible to select any number of commits and right-click + <p>Furthermore, it is possible to select any number of commits and right-click <b>Open</b> to see all versions of the file corresponding to the selected commits (one editor will be opened per version). </p> - <p>If the current input is not a file, then there won't be menu actions for - <b>Open</b> and + <p>If the current input is not a file, then there won't be menu actions for + <b>Open</b> and <b>Compare</b>. However, it is possible to double-click on an entry the Revision Detail area. If compare mode is active, a compare editor will be openend showing the changes for the file being double-clicked in the currently selected commit (i.e. a diff of the file content in the currently selected commit against the file content of this commit's ancestor). If compare mode is not active, an editor with the file content corresponding to the currently selected commit is shown. </p> <p> @@ -312,6 +420,9 @@ <p>Only available when right-clicking on the Revision Comment area. If active, the comments will be auto-wrapped to fill the display area, otherwise the wrapping of the commit message will be used.</p> <h5 id="Fill_Paragraphs">Fill Paragraphs</h5> <p>Only available when right-clicking on the Revision Comment area. If active, the commit message will be displayed without unnecessary line breaks.</p> + <p> + <br/> + </p> <h3 id="Synchronize_View">Synchronize View</h3> <p>A Git synchronization launched using the Team > Synchronize menu command will appear in the Synchronize view. This view allows you to inspect the differences between the resources in the local workspace and a local or remote tracking branch. Alternatively you may compare a local and a remote tracking branch. Comparison of two remote tracking branches as well as menu commands on the Synchronize View are not yet available in this EGit version and will be provided in a future release.</p> <p>Here is what the Git Synchronize View looks like:</p> @@ -331,7 +442,7 @@ </tr> <tr> <td> - <img border="0" src="images/Egit-0.9-synchronize-incoming-add.png"/> + <img border="0" src="images/Egit-0.9-synchronize-incoming-add.png"/> </td> <td>An incoming addition means that a resource has been added to the target branch.</td> </tr> @@ -402,7 +513,7 @@ <dt>Java Model: displays a Java based model (similar to what appears in the Package Explorer).</dt> <dt>Change Sets: displays a Change Set based model. This model shows incoming changes grouped by commit comment which is handy for seeing who released what and why. For outgoing changes, you can create Change Sets for grouping related changes together. Grouping is performed using various commands in the context menu.</dt> </dl> - <p>In addition to to the models, there is also a + <p>In addition to to the models, there is also a <b>Flat Presentation</b> which displays all the out-of-sync elements as top level elements. </p> <h4 id="Navigation">Navigation</h4> @@ -410,6 +521,9 @@ <p> <img border="0" src="images/Egit-0.9-synchronize-navigation.png"/> </p> + <p> + <br/> + </p> <h2 id="Git_URLs">Git URLs</h2> <p>Git URLs in general consist of transport protocol scheme, address of the remote server and the repository path within the remote server and for some authenticating protocols also the user ID.</p> <p>EGit supports the following protocols</p> @@ -418,49 +532,52 @@ <b>file</b> - Direct file system access to the repository. </li> <li> - <b>git</b> - The most efficient built-in git protocol (default port 9418). This protocol doesn't provide authentication. Typically used for anonymous read access to the repository. + <b>git</b> - The most efficient built-in git protocol (default port 9418). This protocol doesn't provide authentication. Typically used for anonymous read access to the repository. </li> <li> - <b>ssh</b> - Git over - <a href="http://tools.ietf.org/html/rfc4251" target="egit_external">secure shell (SSH)</a> protocol. Typically used for authenticated write access to the repository. + <b>ssh</b> - Git over + <a href="http://tools.ietf.org/html/rfc4251" target="egit_external">secure shell (SSH)</a> protocol. Typically used for authenticated write access to the repository. </li> <li> - <b>http</b> - - <a href="http://tools.ietf.org/html/rfc2616" target="egit_external">Hypertext Transfer Protocol</a> can be tunneled through firewalls. + <b>http</b> - + <a href="http://tools.ietf.org/html/rfc2616" target="egit_external">Hypertext Transfer Protocol</a> can be tunneled through firewalls. </li> <li> - <b>https</b> - - <a href="http://tools.ietf.org/html/rfc2818" target="egit_external">Hypertext Transfer Protocol Secure</a> can be tunneled through firewalls. + <b>https</b> - + <a href="http://tools.ietf.org/html/rfc2818" target="egit_external">Hypertext Transfer Protocol Secure</a> can be tunneled through firewalls. </li> <li> - <b>ftp</b> - - <a href="http://tools.ietf.org/html/rfc959" target="egit_external">File Transfer Protocol</a> + <b>ftp</b> - + <a href="http://tools.ietf.org/html/rfc959" target="egit_external">File Transfer Protocol</a> </li> <li> - <b>sftp</b> - - <a href="http://en.wikipedia.org/wiki/SSH_File_Transfer_Protocol" target="egit_external">SSH File Transfer Protocol</a> + <b>sftp</b> - + <a href="http://en.wikipedia.org/wiki/SSH_File_Transfer_Protocol" target="egit_external">SSH File Transfer Protocol</a> </li> </ul> <p> - <b>Note:</b> EGit 0.9 does not yet support authentication via HTTP or HTTPS protocol. + <b>Note:</b> EGit 0.9 does not yet support authentication via HTTP or HTTPS protocol. </p> <p>Git URLs are used when </p> <ul> <li> - <a href="Tasks.html#Cloning_Remote_Repositories">cloning repositories</a> + <a href="Tasks.html#Cloning_Remote_Repositories">cloning repositories</a> </li> <li> - <a href="Tasks.html#Fetching_from_other_Repositories">fetching</a> changes from another repository + <a href="Tasks.html#Fetching_from_other_Repositories">fetching</a> changes from another repository </li> <li> <a href="Tasks.html#Pushing_to_other_Repositories">pushing</a> changes to another repository </li> </ul> + <p> + <br/> + </p> <h2 id="Git_References">Git References</h2> - <p>Git References are also known shortly as - <b>Refs</b>. + <p>Git References are also known shortly as + <b>Refs</b>. - <br/>They comprise + <br/>They comprise </p> <ul> <li>branches </li> @@ -473,7 +590,7 @@ <li>Remote tracking branches start with "refs/remotes/". Remote tracking branches proxy branches located in a remote repository so that their state at the time of the last transport operation can be queried also when no connection to the repository is available (offline).</li> <li>Tags start with "refs/tags/"</li> </ul> - <p>Ref names can be abbreviated as long as the abbreviated form is unique. + <p>Ref names can be abbreviated as long as the abbreviated form is unique. <br/>E.g. </p> @@ -482,14 +599,14 @@ <li>"origin/master" is short for "refs/remotes/origin/master"</li> <li>"v1.0.1" is short for "refs/tags/v1.0.1"</li> </ul> - <p>For a complete list for Ref names and the order of precedence if multiple references have the same shorthand form see the section "Specifying Revisions" section of + <p>For a complete list for Ref names and the order of precedence if multiple references have the same shorthand form see the section "Specifying Revisions" section of <a href="http://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html" target="egit_external">git rev-parse</a>. </p> <h2 id="Refspecs">Refspecs</h2> - <p>A "refspec" is used by fetch and push operations to describe the mapping between remote - <a href="Reference.html#Git_References">Ref</a> and local - <a href="Reference.html#Git_References">Ref</a>. Semantically they define how local branches or tags are mapped to branches or tags in a remote repository. In native git they are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, + to denote forced update. In EGit they can be displayed and also edited in tabular form in the - <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specification</a> and the + <p>A "refspec" is used by fetch and push operations to describe the mapping between remote + <a href="Reference.html#Git_References">Ref</a> and local + <a href="Reference.html#Git_References">Ref</a>. Semantically they define how local branches or tags are mapped to branches or tags in a remote repository. In native git they are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, + to denote forced update. In EGit they can be displayed and also edited in tabular form in the + <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specification</a> and the <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specification</a> dialogs. </p> <h2 id="Remotes">Remotes</h2> @@ -503,14 +620,14 @@ <a href="Tasks.html#Remote_Repositories">Defining Remotes in the Repositories View</a> </li> </ul> - <p>A Remote first of all defines a - <b>name</b> for the repository whose branches you track, this is important since you may want to track branches from different repositories so the name helps to understand what repository a certain operation is dealing with. In addition - <a href="Reference.html#Refspecs">Refspecs</a> specified for a given Remote define a - <b>mapping of branches and tags</b> in your local repository to branches and tags in the remote repository. You may want to use different mappings for inbound or outbound transport operations hence there are + <p>A Remote first of all defines a + <b>name</b> for the repository whose branches you track, this is important since you may want to track branches from different repositories so the name helps to understand what repository a certain operation is dealing with. In addition + <a href="Reference.html#Refspecs">Refspecs</a> specified for a given Remote define a + <b>mapping of branches and tags</b> in your local repository to branches and tags in the remote repository. You may want to use different mappings for inbound or outbound transport operations hence there are <a href="Tasks.html#Cloning_Remote_Repositories">editors</a> to define Fetch and Push Configurations available in EGit. </p> <h2 id="Git_Ignore">Git Ignore</h2> - <p><code>.gitignore</code> files located in the working tree specify files that intentionally should not be tracked by git. They only concern files that are not yet tracked by git. In order to ignore uncommitted changes in already tracked files refer to the + <p><code>.gitignore</code> files located in the working tree specify files that intentionally should not be tracked by git. They only concern files that are not yet tracked by git. In order to ignore uncommitted changes in already tracked files refer to the <a href="Reference.html#Menu_Actions">assume unchanged action</a>. </p> <p>Each line in <code>.gitignore</code> files defines a pattern. Git checks ignore patterns following the hierarchy of the working tree from highest to lowest. Patterns defined in higher level <code>.gitignore</code> files are overridden by those defined in lower levels. @@ -518,25 +635,56 @@ <p>Pattern format definition:</p> <ul> <li>blank lines are ignored</li> - <li>lines starting with + <li>lines starting with <b>#</b> serve as comments </li> - <li>the optional prefix + <li>the optional prefix <b>!</b> negates the pattern. Files excluded by a matching previous pattern become included again. Patterns ending with a slash only match directories but not files or symbolic links. </li> <li>patterns not containing a slash are treated as shell glob patterns matched against the path relative to the location of the .gitignore file</li> - <li>git treats patterns as shell globs as defined in + <li>git treats patterns as shell globs as defined in <a href="http://www.kernel.org/doc/man-pages/online/pages/man3/fnmatch.3.html" target="egit_external">fnmatch(3)</a> </li> - <li>wildcards in patterns do not match + <li>wildcards in patterns do not match <b>/</b> in path names </li> <li>a leading slash matches the beginning of a pathname</li> </ul> - <p>The EGit - <b>Ignore</b> + <p>The EGit + <b>Ignore</b> <a href="Reference.html#Menu_Actions">menu action</a> adds the selected resource to the <code>.gitignore</code> file in the resource's parent directory. To enter other ignore patterns use a text editor. - </p><hr/> + </p> + <h2 id="Git_Fetch_Factory_for_PDE_Build">Git Fetch Factory for PDE Build</h2> + <p>As part of EGit's PDE Tools, there's a PDE Build fetch factory for Git included in the + <b>org.eclipse.egit.fetchfactory</b> plug-in. + </p> + <p>The map file file format: + <b>type@id, + <a href="version">version</a>=GIT,args + </b> + </p> + <p>Where + <b>args</b> is a comma-separated list of key-value pairs. + </p> + <p>Accepted + <b>args</b> include: + </p> + <ul> + <li> + <b>tag*</b> - mandatory Git tag + </li> + <li> + <b>repo*</b> - mandatory repo location + </li> + <li>path - optional path relative to repo which points to the element (otherwise it's assumed that the element is at the repository root)</li> + <li>prebuilt - optional boolean value indicating that the path points to a pre-built bundle in the repository</li> + </ul> + <p>Fetching is implemented as a three-step process:</p> + <ul> + <li>The repository is cloned to local disc. If it already exists, it is assumed that it was previously cloned and just new commits will be fetched</li> + <li>The specified tag will be checked out in the local clone</li> + <li>The content of the path will be copied to the final build location</li> + </ul><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Reverting-Changes.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Reverting-Changes.html deleted file mode 100644 index 2ed19bdbba..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Reverting-Changes.html +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Reverting Changes</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Reverting Changes</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Committing-Changes.html" title="Committing Changes"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Branching.html" title="Branching"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Committing Changes</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Branching</td> - </tr> - </table><hr/> - <h1 id="Reverting_Changes">Reverting Changes</h1> - <h2 id="Reverting_changes_in_the_working_tree">Reverting changes in the working tree</h2> - <h3 id="Replace_with_File_in_Git_Index">Replace with File in Git Index</h3> - <p>Changes which are not yet committed and not yet staged can be reverted for a set of selected files. - Select the file(s) in the Package Explorer or an analogous view and select</p> - <p> - <img border="0" src="images/ReplaceWithGitIndex.png"/> - </p> - <h3 id="Replace_with_HEAD">Replace with HEAD</h3> - <p>This feature is currently not available on single file level. You can use - <b>Reset to</b> with the option - <b>hard</b> to set the whole working tree of your repository to the state of the HEAD commit (See "Resetting your current HEAD" below). By this you revert all changes in the working tree and the index. You can't do it on a selected set of files yet. - </p> - <h2 id="Resetting_your_current_HEAD">Resetting your current HEAD</h2> - <p>Git offers the possibility to reset the HEAD of the current branch to any other commit. It optionally resets the index and the working tree to match that commit. Note that this action affects all files and folders in the whole repository.</p> - <p>You have the option to do a hard reset, a mixed reset and a soft reset.</p> - <ul> - <li> - <b>soft</b> - the HEAD points now to the new commit, the index and the working tree are unchanged - </li> - <li> - <b>mixed</b> - the HEAD points now to the new commit, the index is updated, the working tree is unchanged - </li> - <li> - <b>hard</b> - the HEAD points now to the new commit, the index and the working tree are updated - </li> - </ul> - <h3 id="Reset_to_specific_branch_or_tag">Reset to specific branch or tag</h3> - <p>Select - <b>Team -> Reset...</b> on a project. This opens a dialog where you can select a branch or a tag. - </p> - <h3 id="Reset_to_a_specific_commit">Reset to a specific commit</h3> - <p>Select a commit in the History view and open the context menu. Here you find the entries - <b>Hard reset</b>, - <b>Mixed reset</b> and - <b>Soft reset</b>. - </p> - <h3 id="Revert_all_local_and_staged_changes">Revert all local and staged changes</h3> - <p>This can be done as a special case of reset. If you reset to the current HEAD (normally the last commit on your branch) with the option - <b>hard</b> you overwrite the working tree and the index with the content of the HEAD. You can do this in two ways: - </p> - <ul> - <li>Select - <b>Team > Reset...</b> on a project. In the dialog select HEAD or your current branch and switch the radio button to "hard". - </li> - <li>Open the context menu on the HEAD commit in the history view and select - <b>Hard Reset</b>. - </li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Committing-Changes.html" title="Committing Changes"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Branching.html" title="Branching"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Committing Changes</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Branching</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html deleted file mode 100644 index 93c8336eef..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Starting from existing Git Repositories</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Starting from existing Git Repositories</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Creating-Repositories.html" title="Creating Repositories"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Working-with-remote-Repositories.html" title="Working with remote Repositories"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Creating Repositories</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Working with remote Repositories</td> - </tr> - </table><hr/> - <h1 id="Starting_from_existing_Git_Repositories">Starting from existing Git Repositories</h1> - <p>In order to work with the contents of a Git Repository in the Eclipse workbench, the files and folders contained in this repository must be imported in the form of projects. In principle, this import step can be done using the generic "New Project" or "Import..." wizards, since the working directory of a Git Repository is just a normal directory in the local file system. However, the newly created projects would still have to be shared manually with Git. The "Import Projects from Git" wizards integrates project import and sharing and also offers some extra convenience.</p> - <h2 id="Starting_the_import_wizard">Starting the import wizard</h2> - <p>The wizard is started using - - <br/> - - <b>Import > Git > Projects from Git</b> - - <br/> - - <img border="0" src="images/ImportProjectWizard.png"/> - </p> - <p>If you started in a clean workspace, the first page will display an empty list:</p> - <p> - <img border="0" src="images/ImportProjectEmptyList.png"/> - </p> - <p>Before you can continue, you need to add one or several Git Repositories to the list.</p> - <p>If you have already Repositories in the list, the following step is optional.</p> - <h2 id="Cloning_or_adding_Repositories">Cloning or adding Repositories</h2> - <p>There are two ways to add Git Repositories to the list:</p> - <ol> - <li>Clone a remote Repository</li> - <li>Add an existing Repository from your local file system</li> - </ol> - <h3 id="Cloning_a_Repository">Cloning a Repository</h3> - <p>The first option is used if you start with a remote repository. The clone operation will copy that Repository to your local file system. The Clone wizard is started using the - <b>Clone...</b> button next to the Repository list. The Clone wizard is described in more detail elsewhere. Upon successful completion of the clone wizard, the newly cloned Repository should appear in the list automatically. - </p> - <h3 id="Adding_a_Repository">Adding a Repository</h3> - <p>The second option is useful if you already have a repository in your local file system, for example because you have cloned it earlier, you created it from scratch or you copied it from somewhere else. Clicking on the - <b>Add...</b> button next to the Repository list, a dialog is displayed which allows to enter a directory in the local file system. Press - <b>Search</b> to trigger a scan for Git repositories contained in this directory. If Git repositories are found, they will be shown in a list and you can select repositories to add: - </p> - <p> - <img border="0" src="images/ImportProjectAddDialog.png"/> - </p> - <p>After successful completion, the repository list should contain some repositories:</p> - <p> - <img border="0" src="images/ImportProjectFilledList.png"/> - </p> - <h2 id="Selecting_a_Repository_from_the_List">Selecting a Repository from the List</h2> - <p>You can now select a Repository and click - <b>Next</b>. On the following wizard page, you will have to decide: - </p> - <ul> - <li>How to do the import</li> - <li>How to share the imported projects:</li> - <li>(Optional): limit the scope of the wizard</li> - </ul> - <p> - <img border="0" src="images/ImportProjectSelectWizard.png"/> - </p> - <h2 id="Method_for_importing_Projects">Method for importing Projects</h2> - <h3 id="Import_Existing_Projects">Import Existing Projects</h3> - <p>If this radio button is selected, the wizard will scan the local file system for <tt>.project</tt> files and display the projects found for being imported. This is the most comfortable solution and should be used if <tt>.project</tt> files are checked into the Repository.</p> - <h4 id="Limiting_the_Scope_for_Project_Import">Limiting the Scope for Project Import</h4> - <p>In this case, the directory tree at the bottom is active. You can limit the search for <tt>.project</tt> files by selecting a folder in this tree, otherwise the complete working directory of the Repository will be scanned. On the next page, a list of the found projects (if any) will be shown. This is very similar to the generic - <b>Import Existing Projects</b> wizard, but has some additional filtering capabilities: - </p> - <p> - <img border="0" src="images/ImportProjectProjectList.png"/> - </p> - <h3 id="Use_the_New_Projects_Wizard">Use the New Projects Wizard</h3> - <p>When this option is chosen, this wizard branches to the generic "New Project" wizard. After completion of the "New Project" wizard, this wizard will resume and help you with sharing the newly created projects (if any) created using the "New Project" wizard.</p> - <p>In this case, the directory tree at the bottom is inactive, as the selection is not relevant for the "New Project" wizard.</p> - <h3 id="Import_as_General_Project">Import as General Project</h3> - <p>This option can be helpful when there are neither <tt>.project</tt> files available nor a suitable "New Project" wizard applies to the content of the Git Repository. If chosen, the wizard will generate a <tt>.project</tt> file and point the project to a folder of the Repository's working directory. The result is a "General Project".</p> - <p>By default, the newly generated project will point to the working directory of the Repository. By selecting some folder from the directory tree at the bottom, you can have the project generated for that folder.</p> - <p>When clicking - <b>Next</b> you will see a simple dialog suggesting a name and a directory for the new project: - </p> - <p> - <img border="0" src="images/ImportProjectNewGeneralProject.png"/> - </p> - <p>The name will be suggested to be the same as the name of the directory.</p> - <h2 id="Method_for_Sharing_Imported_Projects">Method for Sharing Imported Projects</h2> - <p>The newly created projects (if any) must be shared with the correct Git Repository in order to become part of the Git Team Provider. The following options for doing this share are provided:</p> - <h3 id="Try_to_Share_Newly_Created_Projects_Automatically">Try to Share Newly Created Projects Automatically</h3> - <p>This is the recommended option: the wizard will automatically detect newly created projects and find the corresponding Repository automatically. No user interaction is required. If automatic sharing fails, the projects will simply remain unshared. You can share them any time manually.</p> - <h3 id="Share_New_Projects_Interactively">Share New Projects Interactively</h3> - <p>This might be useful for very special circumstances where the automatic detection fails. Note that this will block the UI until project import is completed.</p> - <p>A page will be shown with the newly created projects and the corresponding Repositories. Using the check boxes, you can decide which projects to share:</p> - <p> - <img border="0" src="images/ImportProjectShareProject.png"/> - </p> - <h3 id="Do_Not_Share_New_Projects">Do Not Share New Projects</h3> - <p>This may be helpful if you want to share projects manually for some reason.</p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Creating-Repositories.html" title="Creating Repositories"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Working-with-remote-Repositories.html" title="Working with remote Repositories"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Creating Repositories</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Working with remote Repositories</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tagging.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tagging.html deleted file mode 100644 index ab07ddf975..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tagging.html +++ /dev/null @@ -1,107 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Tagging</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Tagging</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Merging.html" title="Merging"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Patches.html" title="Patches"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Merging</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Patches</td> - </tr> - </table><hr/> - <h1 id="Tagging">Tagging</h1> - <h2 id="Creating_a_Tag">Creating a Tag</h2> - <ul> - <li>Select - <b>Team > Tag...</b> from the project context menu. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-tag-create.png"/> - </p> - <ul> - <li>Enter the tag name</li> - <li>Enter the tag message</li> - <li>Optionally select the commit you want to tag (default is HEAD)</li> - <li>Click - <b>OK</b> to create the annotated tag - </li> - </ul> - <h2 id="Replacing_an_Existing_Tag">Replacing an Existing Tag</h2> - <p>What to do if you tagged the wrong commit or ended up with some sort of typo ?</p> - <ul> - <li>If you didn't yet push this out just replace the tag and you are done.</li> - <li> - <b>If it's already published you shouldn't replace the tag</b> but use a new name since otherwise you have to tell everybody who got the old tag to replace it manually with your updated one. This is because, Git does not (and it should not) change tags behind users back. So if somebody already got the old tag, doing a git pull on your tree shouldn't just make them overwrite the old one.}} - </li> - </ul> - <p>So if your old tag wasn't yet pushed you may correct it in the following way :</p> - <ul> - <li>Select - <b>Team > Tag...</b> from the project context menu. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-tag-replace.png"/> - </p> - <ul> - <li>Select the tag you want to replace from the list of existing tags</li> - <li>or start typing any part of the tag you look for into the Tag Name field, this will filter the list of existing tags to those tags which contain the string you are typing, then select the tag you want to replace</li> - <li>Mark the checkbox - <b>Force replace existing tag</b> - </li> - <li>Change the tag and press - <b>OK</b> - </li> - </ul> - <h2 id="Light-weight_and_Signed_Tags">Light-weight and Signed Tags</h2> - <p>Light-weight and signed tags are not yet supported by EGit, use command line <tt> - <b>git tag</b></tt> or <tt> - <b>git tag -s</b></tt> as a workaround - </p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Merging.html" title="Merging"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Patches.html" title="Patches"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Merging</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Patches</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tags.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tags.html deleted file mode 100644 index 85ef02f433..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tags.html +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Tags</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Tags</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Merge.html" title="Merge"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Patches.html" title="Patches"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Merge</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Patches</td> - </tr> - </table><hr/> - <h1 id="Tags">Tags</h1> - <h2 id="Creating_a_Tag">Creating a Tag</h2> - <ul> - <li>Select "Team" -> "Tag..." from the project context menu.</li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-tag-create.png"/> - </p> - <ul> - <li>Enter the tag name</li> - <li>Enter the tag message</li> - <li>Optionally select the commit you want to tag (default is HEAD)</li> - <li>Click OK to create the annotated tag</li> - </ul> - <h2 id="Replacing_an_Existing_Tag">Replacing an Existing Tag</h2> - <p>What to do if you tagged the wrong commit or ended up with some sort of typo ?</p> - <ul> - <li>If you didn't yet push this out just replace the tag and you are done.</li> - <li>If it's already published you shouldn't replace the tag but use a new name since otherwise you have to tell everybody who got the old tag to replace it manually with your updated one. This is because, Git does not (and it should not) change tags behind users back. So if somebody already got the old tag, doing a git pull on your tree shouldn't just make them overwrite the old one.</li> - </ul> - <p> - <br/> - </p> - <p>So if your old tag wasn't yet pushed you may correct it in the following way :</p> - <ul> - <li>Select "Team" -> "Tag..." from the project context menu.</li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-tag-replace.png"/> - </p> - <ul> - <li>Select the tag you want to replace from the list of existing tags</li> - <li>or start typing any part of the tag you look for into the Tag Name field, this will filter the list of existing tags to those tags which contain the string you are typing, then select the tag you want to replace</li> - <li>Mark the checkbox "Force replace existing tag"</li> - <li>Change the tag and press "OK"</li> - </ul> - <h2 id="Light-weight_and_Signed_Tags">Light-weight and Signed Tags</h2> - <p>Light-weight and signed tags are not yet supported by EGit, use command line <tt>git tag</tt> or <tt>git tag -s</tt> as a workaround</p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Merge.html" title="Merge"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Patches.html" title="Patches"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Merge</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Patches</td> - </tr> - </table> - </body> -</html> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html index 964df993df..9d66f04948 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html @@ -32,29 +32,32 @@ <h1 id="Tasks">Tasks</h1> <h2 id="Creating_Repositories">Creating Repositories</h2> <h3 id="Creating_a_new_empty_Git_Repository">Creating a new empty Git Repository</h3> - <p>You can create a project first and share it afterwards. The Share Project Wizard supports creation of Git repositories (see + <p>You can create a project first and share it afterwards. The Share Project Wizard supports creation of Git repositories (see <a href="http://wiki.eclipse.org/EGit/User_Guide/Sharing#Adding_a_project_to_version_control" title="EGit/User Guide/Sharing#Adding_a_project_to_version_control" target="egit_external">Adding a project to version control</a>). </p> - <p>You can also create a new empty Git Repository from the Git Repositories View (see + <p>You can also create a new empty Git Repository from the Git Repositories View (see <a href="Creating_a_Repository" title="EGit/User_Guide#Creating_a_Repository">Creating a Repository</a>). </p> <h3 id="Creating_a_Git_Repository_for_multiple_Projects">Creating a Git Repository for multiple Projects</h3> <p>You may first create multiple projects under a common directory and then create a common repository for all projects in one go: </p> <ul> <li>create the Eclipse projects e.g. a, b, c under a common directory e.g. <span style="font-family:monospace;">/repos/examples/</span> </li> - <li>select all projects a, b, c - from context menu click + <li>select all projects a, b, c - from context menu click <b>Team > Share Project > Git</b> </li> - <li>press + <li>press <b>Next</b> </li> <li>select all projects a, b, c </li> <li>the wizard automatically moves up the default repository location to the parent folder <span style="font-family:monospace;">/repos/examples/</span> since multiple projects have been selected </li> - <li>click - <b>Create Repository</b> and + <li>click + <b>Create Repository</b> and <b>Finish</b> </li> </ul> + <p> + <br/> + </p> <h2 id="Starting_from_existing_Git_Repositories">Starting from existing Git Repositories</h2> <p>In order to work with the content of a Git repository in the Eclipse workbench, the contained files and folders must be imported as projects. In principle, this import can be done using the generic "New Project" or "Import..." wizards, since the working directory of a Git Repository is just a normal directory in the local file system. However, the newly created projects would still have to be shared manually with Git. The "Import Projects from Git" wizards integrates project import and sharing and also offers some extra convenience.</p> <h3 id="Starting_the_import_wizard">Starting the import wizard</h3> @@ -75,13 +78,13 @@ <li>Add an existing repository from your local file system</li> </ol> <h4 id="Cloning_a_Repository">Cloning a Repository</h4> - <p>The first option is used if you start with a remote repository. The clone operation will copy that repository to your local file system. To start the Clone Wizard click - <b>Clone...</b>. The Clone Wizard is described in more detail in + <p>The first option is used if you start with a remote repository. The clone operation will copy that repository to your local file system. To start the Clone Wizard click + <b>Clone...</b>. The Clone Wizard is described in more detail in <a href="Cloning_Remote_Repositories" title="EGit/User_Guide#Cloning_Remote_Repositories">Cloning Remote Repositories</a>. Upon successful completion of the clone operation, the newly cloned repository appears in the list automatically. </p> <h4 id="Adding_a_Repository">Adding a Repository</h4> - <p>The second option is useful if you already have a repository in your local file system, for example because you have cloned it earlier, you created it from scratch or you copied it from somewhere else. Click - <b>Add...</b>; and select a directory in the local file system. Press + <p>The second option is useful if you already have a repository in your local file system, for example because you have cloned it earlier, you created it from scratch or you copied it from somewhere else. Click + <b>Add...</b>; and select a directory in the local file system. Press <b>Search</b> to trigger a scan for Git repositories contained in this directory. If Git repositories are found, they will be listed and you can select repositories to add : </p> <p> @@ -92,7 +95,7 @@ <img border="0" src="images/Egit-0.9-import-projects-filled-list.png"/> </p> <h3 id="Selecting_a_Repository_from_the_List">Selecting a Repository from the List</h3> - <p>You can now select a repository and click + <p>You can now select a repository and click <b>Next</b>. On the following wizard page, you will have to decide: </p> <ul> @@ -107,7 +110,7 @@ <h4 id="Import_Existing_Projects">Import Existing Projects</h4> <p>If this radio button is selected, the wizard will scan the local file system for <tt>.project</tt> files and display the projects found for being imported. This is the most comfortable solution and should be used if <tt>.project</tt> files are checked into the Repository.</p> <h5 id="Limiting_the_Scope_for_Project_Import">Limiting the Scope for Project Import</h5> - <p>In this case, the directory tree at the bottom is active. You can limit the search for <tt>.project</tt> files by selecting a folder in this tree, otherwise the complete working directory of the repository will be scanned. On the next page, a list of the found projects (if any) will be shown. This is very similar to the generic + <p>In this case, the directory tree at the bottom is active. You can limit the search for <tt>.project</tt> files by selecting a folder in this tree, otherwise the complete working directory of the repository will be scanned. On the next page, a list of the found projects (if any) will be shown. This is very similar to the generic <b>Import Existing Projects</b> wizard, but has some additional filtering capabilities: </p> <p> @@ -119,7 +122,7 @@ <h4 id="Import_as_General_Project">Import as General Project</h4> <p>This option can be helpful when there are neither <tt>.project</tt> files available nor a suitable "New Project" wizard applies to the content of the Git Repository. If chosen, the wizard will generate a <tt>.project</tt> file and point the project to a folder of the Repository's working directory. The result is a "General Project".</p> <p>By default, the newly generated project will point to the working directory of the Repository. By selecting some folder from the directory tree at the bottom, you can have the project generated for that folder.</p> - <p>Click + <p>Click <b>Next</b> to open a simple dialog for entering a name and a directory for the new project: </p> <p> @@ -137,49 +140,56 @@ <img border="0" src="images/Egit-0.9-import-projects-share-manually.png"/> </p> <h4 id="Do_Not_Share_New_Projects">Do Not Share New Projects</h4> - <p>This may be helpful if for some reason you want to share projects manually.</p> + <p>This may be helpful if for some reason you want to share projects manually. + + <br/> + <br/> + </p> <h2 id="Working_with_remote_Repositories">Working with remote Repositories</h2> <h3 id="Cloning_Remote_Repositories">Cloning Remote Repositories</h3> <p>Using the Git Clone Wizard you may clone remote repositories using different transport protocols. </p> - <p>The wizard can be started from the "Import Projects from Git" wizard using + <p>The wizard can be started from the "Import Projects from Git" wizard using <br/> <b>Import... > Git > Projects from Git > Next > Clone...</b> </p> - <p>or from the "Git Repositories View" (described in - <a href="Managing_Repositories" title="EGit/User_Guide#Managing_Repositories">Managing Repositories</a>) using the - <b>Clone a Git Repository</b> toolbar button. + <p>or from the "Git Repositories View" (described in + <a href="Managing_Repositories" title="EGit/User_Guide#Managing_Repositories">Managing Repositories</a>) using the + <b>Clone a Git Repository</b> toolbar button or view menu. </p> <h4 id="Repository_Selection">Repository Selection</h4> <p>On the first page of the wizard enter the location of the remote repository: </p> <p> - <img border="0" src="images/Egit-0.9-clone-wizard-url-page.png"/> + <img border="0" src="images/Egit-0.9-clone-wizard-url-page.png"/> </p> <ul> <li> - <b>URI</b> - The complete URI of the remote repository or the path on the file system. This field is automatically synchronized with the other fields. - <br/>Note that you can use the - <b>Local file...</b> button to browse for a local directory and that the URI field offers content assist by offering previously used values + <b>URI</b> - The complete URI of the remote repository or the path on the file system. This field is automatically synchronized with the other fields. + <br/>Note that you can use the + <b>Local file...</b> button to browse for a local directory and that the URI field offers content assist by offering previously used values </li> <li> - <b>Host</b> - The name of the remote host or empty if cloning from the file system. + <b>Host</b> - The name of the remote host or empty if cloning from the file system. </li> <li> - <b>Repository Path</b> - Path to the remote repository or on the file system. + <b>Repository Path</b> - Path to the remote repository or on the file system. </li> <li> - <b>Protocol</b> - One of the protocols described below. + <b>Protocol</b> - One of the protocols described below. </li> <li> - <b>Port</b> - Port number. + <b>Port</b> - Port number. </li> <li> - <b>User</b> - The user name used for authentication. + <b>User</b> - The user name used for authentication. </li> <li> <b>Password</b> The password used for authentication. </li> + <li> + <b>Store in Secure Store</b> Whether the password is saved in the Eclipse secure store. + </li> </ul> <p>The following protocols are supported: </p> <ul> @@ -187,31 +197,39 @@ <b>file</b> - File system access to the repository. </li> <li> - <b>ftp</b> - - <a href="http://tools.ietf.org/html/rfc959" target="egit_external">File Transfer Protocol</a> + <b>ftp</b> - + <a href="http://tools.ietf.org/html/rfc959" target="egit_external">File Transfer Protocol</a> </li> <li> - <b>git</b> - The most efficient built-in git protocol (default port 9418). This protocol doesn't provide authentication. Typically used for anonymous read access to the repository. + <b>git</b> - The most efficient built-in git protocol (default port 9418). This protocol doesn't provide authentication. Typically used for anonymous read access to the repository. </li> <li> - <b>http</b> - - <a href="http://tools.ietf.org/html/rfc2616" target="egit_external">Hypertext Transfer Protocol</a> can be tunneled through firewalls. + <b>http</b> - + <a href="http://tools.ietf.org/html/rfc2616" target="egit_external">Hypertext Transfer Protocol</a> can be tunneled through firewalls. </li> <li> - <b>https</b> - - <a href="http://tools.ietf.org/html/rfc2818" target="egit_external">Hypertext Transfer Protocol Secure</a> can be tunneled through firewalls. + <b>https</b> - + <a href="http://tools.ietf.org/html/rfc2818" target="egit_external">Hypertext Transfer Protocol Secure</a> can be tunneled through firewalls. </li> <li> - <b>sftp</b> - - <a href="http://en.wikipedia.org/wiki/SSH_File_Transfer_Protocol" target="egit_external">SSH File Transfer Protocol</a> + <b>sftp</b> - + <a href="http://en.wikipedia.org/wiki/SSH_File_Transfer_Protocol" target="egit_external">SSH File Transfer Protocol</a> </li> <li> - <b>ssh</b> - Git over + <b>ssh</b> - Git over <a href="http://tools.ietf.org/html/rfc4251" target="egit_external">secure shell (SSH)</a> protocol. Typically used for authenticated write access to the repository. </li> </ul> <p> - <b>Note:</b> EGit 0.9 does not yet support authentication via HTTP or HTTPS protocol. + <b>New:</b> Support for authentication via HTTP or HTTPS protocol is introduced with EGit 0.10. + + <br/> + + <b>Note:</b> If you are behind a firewall you may need to configure your proxy settings ( + <b>Preferences > General > Network Connections</b>). Many HTTP proxies are configured to block URLs containing a username (and/or password) like e.g. + <a href="http://fred:topsecret@egit.eclipse.org/egit.git" target="egit_external">http://fred:topsecret@egit.eclipse.org/egit.git</a> hence it's recommended to use the + <i>user</i>, + <i>password</i> fields at the bottom of the wizard page, the credentials will be transmitted as HTTP headers. </p> <h4 id="Branch_Selection">Branch Selection</h4> <p>On the next page choose which branches shall be cloned from the remote repository: </p> @@ -221,22 +239,25 @@ <h4 id="Local_Destination">Local Destination</h4> <p>On the next page define where you want to store the repository on the local file system and define some initial settings. </p> <p> - <img border="0" src="images/Egit-0.9-clone-wizard-destination-page.png"/> + <img border="0" src="images/Egit-0.9-clone-wizard-destination-page.png"/> </p> <ul> <li> - <b>Directory</b> - The directory which will contain the Git repository. It will be created by the wizard if it does not yet exist. + <b>Directory</b> - The directory which will contain the Git repository. It will be created by the wizard if it does not yet exist. </li> <li> - <b>Initial branch</b> - Choose here which local branch will be created and initially checked out. + <b>Initial branch</b> - Choose here which local branch will be created and initially checked out. </li> <li> <b>Remote name</b> - Define a name for the remote repository. The default is "origin". </li> </ul> + <p> + <br/> + </p> <h3 id="Pushing_to_other_Repositories">Pushing to other Repositories</h3> <h4 id="Direct_Push">Direct Push</h4> - <p>The easiest way for pushing is to use + <p>The easiest way for pushing is to use <a href="Tasks.html#Direct_Fetch_and_Push_Support">Direct Push Support</a> on a Push Specification of a Remote. </p> <h4 id="Push_Wizard">Push Wizard</h4> @@ -248,10 +269,10 @@ </p> <h5 id="Push_URI">Push URI</h5> <ul> - <li>If you already configured a Push Specification in the Repositories View you may also select it here using the drop-down list under + <li>If you already configured a Push Specification in the Repositories View you may also select it here using the drop-down list under <b>Configured remote repositories</b>. </li> - <li>Otherwise click + <li>Otherwise click <b>Custom URI</b> and enter the URI of the upstream repository you want to push to. </li> </ul> @@ -259,7 +280,7 @@ <img border="0" src="images/Egit-0.9-push-wizard-destination-page.png"/> </p> <h5 id="Push_Ref_Specifications">Push Ref Specifications</h5> - <p>Click + <p>Click <b>Next</b> <br/> @@ -272,66 +293,66 @@ <p> <img border="0" src="images/Egit-0.9-push-wizard-ssh-passphrase.png"/> </p> - <p>Click + <p>Click <b>Add all branches spec</b> </p> <p> <img border="0" src="images/Egit-0.9-push-wizard-refspec-allbranches.png"/> </p> <p>This is a convenient way to declare that you want to map your local branch names to the same branch names on the upstream repository you want to push changes to. </p> - <p>Click + <p>Click <b>Add all tags spec</b> to map local tags 1:1 to tags in the repository you want to push to. </p> <p>If you want to map local branches to those in the upstream repository in a different way you may define more detailed mapping specifications in the following way</p> <ul> <li>enter source and destination ref or select already existing branches from the drop-down lists</li> - <li>click + <li>click <b>Add spec</b> </li> </ul> - <p>This will transfer the newly defined mapping to the list + <p>This will transfer the newly defined mapping to the list <b>Specifications for push</b> </p> <p> <b>Other common push specs:</b> </p> <ul> - <li>You may e.g. map <tt>refs/heads/*</tt> to <tt>refs/heads/joe/*</tt> if you want to name the branches you push to according to your nickname + <li>You may e.g. map <tt>refs/heads/*</tt> to <tt>refs/heads/joe/*</tt> if you want to name the branches you push to according to your nickname <i>joe</i>. This is useful if multiple users want to publish their local branches on personal branches in a jointly used public repository. </li> <li>Another usual mapping is to map the source ref <tt>HEAD</tt> to the destination <tt>refs/heads/master</tt>. This means you want to map your current <tt>HEAD</tt> (which might currently point e.g. to any local topic branch) to the upstream master branch.</li> </ul> <h5 id="Delete_Ref_Specifications">Delete Ref Specifications</h5> - <p>To delete a ref in the destination repository select the ref to be deleted from the drop-down list + <p>To delete a ref in the destination repository select the ref to be deleted from the drop-down list <b>Remote ref to delete</b> - and click - <b>Add spec</b>. This will create a corresponding entry in the + and click + <b>Add spec</b>. This will create a corresponding entry in the <b>Specifications for push</b> list. Alternatively you may type in the specification for the refs to be deleted, this may also use wildcards. Pushing Delete Ref Specifications will delete the matching Refs in the destination repository. </p> <p> <img border="0" src="images/Egit-0.9-push-wizard-delete-refspec.png"/> </p> <h5 id="Conflicting_Push_Ref_Specifications">Conflicting Push Ref Specifications</h5> - <p>If you add multiple conflicting Push Ref Specifications they will be marked in red, solve this by removing or editing the conflicting specs. It is also possible to edit the specs in-place in the list + <p>If you add multiple conflicting Push Ref Specifications they will be marked in red, solve this by removing or editing the conflicting specs. It is also possible to edit the specs in-place in the list <b>Specifications for push</b> </p> <p> <img border="0" src="images/Egit-0.9-push-wizard-refspec-conflict.png"/> </p> <h5 id="Push_Confirmation">Push Confirmation</h5> - <p>Click + <p>Click <b>Next</b> </p> <p>This will open the Push Confirmation dialog showing a preview which changes will be pushed to the destination repository. - If this does not match your expectation click - <b>Back</b> and correct your push specs accordingly. + If this does not match your expectation click + <b>Back</b> and correct your push specs accordingly. </p> <ul> <li>For ref updates the range of commits to be pushed will be shown in the format <tt> <b><SHA1-from>..<SHA1-to></b></tt> e.g. <tt> <b>d97f5a2e..adfdbfd2</b></tt> means all commits between <tt> <b>d97f5a2e</b></tt> and <tt> - <b>adfdbfd2</b></tt> will be pushed. + <b>adfdbfd2</b></tt> will be pushed. </li> <li>For refs which do not yet exist in the destination repository <tt> <b>[new branch]</b></tt> or <tt> @@ -345,15 +366,15 @@ <img border="0" src="images/Egit-0.9-push-wizard-confirm-push.png"/> </p> <ul> - <li>Select the + <li>Select the <b>Push only if remote refs don't change in the mean time</b> check box if you want to be sure that what you see in this preview is also what you get when pushing these changes out. </li> - <li>Select the + <li>Select the <b>Show final report dialog only when it differs from this confirmation report</b> check box if you only want to get a report after executing the push if the result differs from this preview. </li> </ul> <h5 id="Push_Result_Report">Push Result Report</h5> - <p>Click + <p>Click <b>Finish</b> </p> <p>Depending on the options you have chosen a push result report dialog is shown</p> @@ -361,14 +382,17 @@ <img border="0" src="images/Egit-0.9-push-wizard-push-result.png"/> </p> <p>In the box at the bottom the push confirmation message from the remote server is displayed. - In case of any errors you will find the error message from the remote server here. To see the message for + In case of any errors you will find the error message from the remote server here. To see the message for a given list entry simply select it in the list.</p> - <p>Click + <p>Click <b>Ok</b> to close the dialog. + + <br/> + <br/> </p> <h3 id="Fetching_from_other_Repositories">Fetching from other Repositories</h3> <h4 id="Direct_Fetch">Direct Fetch</h4> - <p>The easiest way for fetching is to use + <p>The easiest way for fetching is to use <a href="Tasks.html#Direct_Fetch_and_Push_Support">Direct Fetch Support</a> on a Fetch Specification of a Remote. </p> <h4 id="Fetch_Wizard">Fetch Wizard</h4> @@ -379,7 +403,7 @@ <b>Team > Fetch...</b> </p> <ul> - <li>If you already configured a Fetch Specification in the Repositories View you may also select it here using the drop-down list under + <li>If you already configured a Fetch Specification in the Repositories View you may also select it here using the drop-down list under <b>Configured remote repositories</b>. </li> </ul> @@ -387,7 +411,7 @@ <img border="0" src="images/Egit-0.9-fetch-wizard-source-page.png"/> </p> <ul> - <li>Otherwise click + <li>Otherwise click <b>Custom URI</b> and enter the URI of the upstream repository you want to fetch changes from. </li> </ul> @@ -395,11 +419,11 @@ <img border="0" src="images/Egit-0.9-fetch-wizard-source-url-page.png"/> </p> <h5 id="Fetch_Ref_Specifications">Fetch Ref Specifications</h5> - <p>Click + <p>Click <b>Next</b> <br/> - Click + Click <b>Add all branches spec</b> </p> <p> @@ -407,9 +431,9 @@ </p> <p>This is a convenient way to declare that you want to map the branch names in the upstream repository you want to fetch changes from 1:1 to the same local branch names. </p> <ul> - <li>Click in the edit field - <b>Destination Ref</b> and replace the path segment - <i>choose_remote_name</i> with a symbolic name for the upstream repository you are going to fetch from. + <li>Click in the edit field + <b>Destination Ref</b> and replace the path segment + <i>choose_remote_name</i> with a symbolic name for the upstream repository you are going to fetch from. </li> <li>The default remote name for the repository your repository has been cloned from is <tt> <b>origin</b></tt>. The master of this remote maps by default from <tt> @@ -420,34 +444,34 @@ <b>refs/heads/*</b></tt> to the following tracking branches <tt> <b>refs/remotes/joe/*</b></tt>. </li> - <li>Deselect + <li>Deselect <b>Force Update</b> if you want to allow fast-forward updates only, select this option if you also want to allow non-fast-forward changes. </li> - <li>Click + <li>Click <b>Force Update all Refs</b> to set the force update option on all specs </li> - <li>Click - <b>Remove all specs</b> to remove all specs from the list + <li>Click + <b>Remove all specs</b> to remove all specs from the list <b>Specifications for fetch</b> </li> </ul> <ul> - <li>Click + <li>Click <b>Add all tags spec</b> to map tags tags in the repository you want to fetch from 1:1 to local tags. </li> </ul> <p>If you want to map branches or tags in the upstream repository to local branches in a different way you may define more detailed mapping specifications in the following way</p> <ul> <li>enter source (ref in source repository) and destination ref (tracking branch or tag in local repository) or select already existing branches from the drop-down lists</li> - <li>click + <li>click <b>Add spec</b> </li> </ul> - <p>This will transfer the newly defined mapping to the list + <p>This will transfer the newly defined mapping to the list <b>Specifications for fetch</b> </p> <h5 id="Fetch_Result_Report">Fetch Result Report</h5> - <p>Click + <p>Click <b>Finish</b> </p> <p> @@ -459,7 +483,7 @@ <b><SHA1-from>..<SHA1-to></b></tt> e.g. <tt> <b>d97f5a2e..adfdbfd2</b></tt> means all commits between <tt> <b>d97f5a2e</b></tt> and <tt> - <b>adfdbfd2</b></tt> have been fetched. + <b>adfdbfd2</b></tt> have been fetched. </li> <li>For refs which didn't exist before in the local repository <tt> <b>[new branch]</b></tt> or <tt> @@ -469,50 +493,55 @@ <b>[deleted]</b></tt> is shown. </li> </ul> + <p> + <br/> + </p> <h3 id="Pulling_New_Changes_from_Upstream_Repositories">Pulling New Changes from Upstream Repositories</h3> - <p>This is not yet fully available. </p> - <p>In cases where fast-forward merges are sufficient (full merge is not yet implemented) you may run pull in EGit in the following way:</p> + <p>Pull is available since EGit 0.10:</p> <ul> - <li> - <a href="Tasks.html#Fetching_from_other_Repositories">Fetch changes</a> from upstream repository - </li> - <li> - <a href="Tasks.html#Check-out_of_Branches_and_Tags">Checkout the branch</a> you want to pull the upstream changes into + <li>click + <b>Team > Pull</b> to pull new changes from the upstream branch your local branch is tracking </li> + <li>whenever you create a local branch based on a remote tracking branch EGit configures a tracking relationship so that subsequent pulls will fetch and merge the changes from the tracked upstream branch.</li> <li> - <a href="Tasks.html#Merging_a_branch_or_a_tag_into_the_current_branch">Merge</a> the branch or tag you want to integrate into your current branch + <b>pull --rebase</b> is not yet supported by EGit </li> + <li>ad-hoc selection of the upstream branch to pull from is not yet supported by EGit</li> </ul> <p>Available alternatives currently include: </p> <ul> - <li>run - <b>git pull</b> from outside eclipse (but - <a href="http://marc.info/?l=git&m=123924844219075" target="egit_external">beware on Windows</a>) + <li>run + <b>git pull</b> from outside eclipse (but + <a href="http://marc.info/?l=git&m=123924844219075" target="egit_external">beware on Windows</a>) </li> - <li>if you did no local change or want to discard your local changes, use + <li>if you did no local change or want to discard your local changes, use <b>Team > Reset...</b> </li> </ul> + <p> + <br/> + <br/> + </p> <h2 id="Inspecting_the_state_of_the_Repository">Inspecting the state of the Repository</h2> <h3 id="Label_Decorations">Label Decorations</h3> <p>Label decorations show Git specific information on resources under Git version control. They appear in all views showing model objects, like Package Explorer, Project Explorer, Navigator, Hierarchy View. </p> <p>The Git label decorations can be switched on globally in the Preference Menu ( - <b>Window > Preferences</b>) under - <b>General > Appearance > Label Decorations</b>. + <b>Window > Preferences</b>) under + <b>General > Appearance > Label Decorations</b>. </p> - <p>More detailed settings can be done in the Preferences under - <b>Team > Git > Label Decorations</b>. + <p>More detailed settings can be done in the Preferences under + <b>Team > Git > Label Decorations</b>. </p> <p>There are two different types of label decorations: text decorations and icon decorations. </p> <h4 id="Text_Decorations">Text Decorations</h4> - <p>Text decorations appear on the left or right side of the text label. They can be configured on the Preferences dialog under - <b>Team > Git > Label Decorations</b> on the tab + <p>Text decorations appear on the left or right side of the text label. They can be configured on the Preferences dialog under + <b>Team > Git > Label Decorations</b> on the tab <b>Text Decorations</b>. For example, the default for a dirty resource is a <tt> - <b>></b></tt> on the left side of its name. + <b>></b></tt> on the left side of its name. </p> <p>These are the default settings: </p> <p> - <img border="0" src="images/01-TextDecorations.png"/> + <img border="0" src="images/01-TextDecorations.png"/> </p> <p>For files and folders there are the variables <tt>"name"</tt>, <tt>"dirty"</tt> and <tt>"staged"</tt>. <tt>"Dirty"</tt> and <tt>"staged"</tt> are flags; if they are true, the text after the colon is displayed.</p> <p>For projects there are the additional variables <tt>"repository"</tt> and <tt>"branch"</tt>. The <tt>"repository"</tt> variable displays the name of the repository.</p> @@ -526,53 +555,57 @@ <img border="0" src="images/03-ExampleDecoration.png"/> </p> <h4 id="Icon_Decorations">Icon Decorations</h4> - <p>Icon decorations appear on the lower right corner of the icon displayed in front of the label. They can be configured on the Preferences dialog under - <b>Team > Git > Label Decorations</b> on the tab - <b>Icon Decorations</b>. + <p>Icon decorations appear on the lower right corner of the icon displayed in front of the label. They can be configured on the Preferences dialog under + <b>Team > Git > Label Decorations</b> on the tab + <b>Icon Decorations</b>. </p> <p>These are the default decorations: </p> <p> - <img border="0" src="images/02-IconDecorations.png"/> + <img border="0" src="images/02-IconDecorations.png"/> </p> <ul> <li> - <b>dirty (folder)</b> - At least one file below the folder is dirty; that means that it has changes in the working tree that are neither in the index nor in the repository. + <b>dirty (folder)</b> - At least one file below the folder is dirty; that means that it has changes in the working tree that are neither in the index nor in the repository. </li> <li> - <b>tracked</b> - The resource is known to the Git repository and hence under version control. + <b>tracked</b> - The resource is known to the Git repository and hence under version control. </li> <li> - <b>untracked</b> - The resource is not known to the Git repository and will not be version controlled until it is explicitly added. + <b>untracked</b> - The resource is not known to the Git repository and will not be version controlled until it is explicitly added. </li> <li> - <b>ignored</b> - The resource is ignored by the Git team provider. The preference settings under - <b>Team > Ignored Resources</b>, "derived" flag and settings from <tt>.gitignore</tt> files are taken into account. + <b>ignored</b> - The resource is ignored by the Git team provider. The preference settings under + <b>Team > Ignored Resources</b>, "derived" flag and settings from <tt>.gitignore</tt> files are taken into account. </li> <li> - <b>dirty</b> - The resource has changes in the working tree that are neither in the index nor in the repository. + <b>dirty</b> - The resource has changes in the working tree that are neither in the index nor in the repository. </li> <li> - <b>staged</b> - The resource has changes which have been added to the index. Note that adding changes to the index is currently possible only in the commit dialog via the context menu of a resource. + <b>staged</b> - The resource has changes which have been added to the index. Note that adding changes to the index is currently possible only in the commit dialog via the context menu of a resource. </li> <li> - <b>partially-staged</b> - The resource has changes which are added to the index and additional changes in the working tree that neither reached the index nor have been committed to the repository. + <b>partially-staged</b> - The resource has changes which are added to the index and additional changes in the working tree that neither reached the index nor have been committed to the repository. </li> <li> - <b>added</b> - The resource has not yet reached any commit in the repository but has been freshly added to the Git repository in order to be tracked in future. + <b>added</b> - The resource has not yet reached any commit in the repository but has been freshly added to the Git repository in order to be tracked in future. </li> <li> - <b>removed</b> - The resource is staged for removal from the Git repository. + <b>removed</b> - The resource is staged for removal from the Git repository. </li> <li> - <b>conflict</b> - A merge conflict exists for the file. + <b>conflict</b> - A merge conflict exists for the file. </li> <li> - <b>assume-valid</b> - The resource has the "assume unchanged" flag. This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. Also see + <b>assume-valid</b> - The resource has the "assume unchanged" flag. This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. Also see <a href="Reference.html#Menu_Actions">Assume unchanged action</a>. </li> </ul> <h3 id="Commit_Dialog">Commit Dialog</h3> - <p>A summary of the status of all modified tracked files is displayed on the commit dialog. By double clicking a file the changes to be committed will be displayed in a compare dialog. As EGit currently always commits the content of the working tree (corresponding to git commit -a on the command line) the compare dialog will compare the working tree with the last commit.</p> + <p>A summary of the status of all modified tracked files is displayed on the commit dialog. By double clicking a file the changes to be committed will be displayed in a compare dialog. As EGit currently always commits the content of the working tree (corresponding to git commit -a on the command line) the compare dialog will compare the working tree with the last commit. + + <br/> + <br/> + </p> <h3 id="Comparing_Content">Comparing Content</h3> <p>In daily work you will often want to see the changes between your last commit, the index, and the current working tree. </p> <p> @@ -582,92 +615,98 @@ <h4 id="Compare_working_tree_with_last_commit">Compare working tree with last commit</h4> <p>The difference between a file in the current working directory and in the last commit in the current branch can be viewed from the context menu "Compare With" -> "HEAD revision". This feature is also available in the Commit dialog. Double clicking on an entry in the Commit dialog opens a compare dialog. </p> <h4 id="Comparing_Working_Tree_with_Index">Comparing Working Tree with Index</h4> - <p>The difference between a file in the current working directory and in the index can be viewed from the context menu - <b>Compare With > Git Index</b>. + <p>The difference between a file in the current working directory and in the index can be viewed from the context menu + <b>Compare With > Git Index</b>. </p> <h4 id="Comparing_Working_Tree_with_Any_Commit">Comparing Working Tree with Any Commit</h4> <ul> <li>Select a file in the package explorer </li> - <li>from the context menu select - <b>Show in > History</b> or + <li>from the context menu select + <b>Show in > History</b> or <b>Compare With > History...</b> </li> <li>in the commit graph select a commit </li> - <li>from the context menu select - <b>Compare with working tree</b> + <li>from the context menu select + <b>Compare with working tree</b> </li> <li>this will open a compare dialog showing the changes between the selected commit and the current working tree</li> </ul> <h4 id="Comparing_Two_Commits_with_Each_Other">Comparing Two Commits with Each Other</h4> <ul> <li>Select a file in the package explorer </li> - <li>from the context menu select - <b>Show in > History</b> or + <li>from the context menu select + <b>Show in > History</b> or <b>Compare With > History...</b> </li> <li>in the commit graph select two commits </li> - <li>from the context menu select - <b>Compare with each other</b> + <li>from the context menu select + <b>Compare with each other</b> </li> <li>this will open a compare dialog showing the changes between the two selected commits</li> </ul> <h4 id="Comparing_Index_with_HEAD_or_Any_Other_Commit">Comparing Index with HEAD or Any Other Commit</h4> <p>This feature is not implemented yet.</p> + <p> + <br/> + </p> <h3 id="Comparing_with_Branches_.28Synchronize.29">Comparing with Branches (Synchronize)</h3> - <p>The difference between two branches can be viewed from project's context menu - <b>Team > Synchronize</b>. If the git repository contains multiple Eclipse projects it is enough to select one project, the - <b>Synchronization view</b> will include all other projects. It is critical to have all important files/projects imported into Eclipse because the - <b>Synchronization view</b> can only dispatch and show files that are known as a resource in Eclipse any other files will - <b>never</b> appear in the - <b>Synchronization view</b>. + <p>The difference between two branches can be viewed from project's context menu + <b>Team > Synchronize</b>. If the git repository contains multiple Eclipse projects it is enough to select one project, the + <b>Synchronization view</b> will include all other projects. It is critical to have all important files/projects imported into Eclipse because the + <b>Synchronization view</b> can only dispatch and show files that are known as a resource in Eclipse any other files will + <b>never</b> appear in the + <b>Synchronization view</b>. </p> - <p>After launching - <b>Synchronize</b> action the - <b>Synchronization dialog</b> will appear. + <p>After launching + <b>Synchronize</b> action the + <b>Synchronization dialog</b> will appear. </p> <p> <img border="0" src="images/Synchronize-dialog.jpg"/> </p> <p>Here you can select two branches that should be compared. By checking "include local uncommited changed files" you can include locally made changes and currently staged files in comparison (currently this is not supported by ChangeSet implementation).</p> - <p>It is also possible to compare multiple repositories at once. In this case for each repository the + <p>It is also possible to compare multiple repositories at once. In this case for each repository the <b>Synchronize dialog</b> will appear and you could select a different configuration for each repository. </p> <h3 id="Quickdiff">Quickdiff</h3> - <p>Instead of using a compare editor you can enable quick diff support and see the changes within the text editor. + <p>Instead of using a compare editor you can enable quick diff support and see the changes within the text editor. - <br/>This feature can be enabled via the - <b>General > Editors > Text Editors > Quick Diff</b> preference page: + <br/>This feature can be enabled via the + <b>General > Editors > Text Editors > Quick Diff</b> preference page: </p> <p> - <img border="0" src="images/04-QuickDiffPreferences.png"/> + <img border="0" src="images/04-QuickDiffPreferences.png"/> </p> <p>The difference annotation will then be displayed on the left hand side of the editor: </p> <p> - <img border="0" src="images/05-QuickDiffInEditor.png"/> + <img border="0" src="images/05-QuickDiffInEditor.png"/> </p> <p>If you move your mouse over the annotation you see the content of the version you are comparing to: </p> <p> - <img border="0" src="images/06-QuickDiffInEditorPopup.png"/> + <img border="0" src="images/06-QuickDiffInEditorPopup.png"/> </p> <p>Per default, the comparison is against the HEAD. You can determine the version you are comparing to, the so-called quickdiff baseline, from the context menu of a commit in the history view ( - <b>Show in > History</b>). There are three menu entries: + <b>Show in > History</b>). There are three menu entries: </p> <ul> <li> <b>Quick Diff -> Reset baseline to first parent of HEAD</b> - Compare against the first commit before HEAD. </li> <li> - <b>Quick Diff -> Reset baseline to HEAD</b> - Compare against HEAD. + <b>Quick Diff -> Reset baseline to HEAD</b> - Compare against HEAD. </li> <li> <b>Quick Diff -> Set as baseline</b> - Compare against the selected commit </li> </ul> + <p> + <br/> + </p> <h3 id="View_Diff_for_a_Commit">View Diff for a Commit</h3> <p>To display the diff for a given commit </p> <ul> - <li>from context menu in package explorer select - <b>Team > Show in Resource History</b> + <li>from context menu in package explorer select + <b>Team > Show in Resource History</b> </li> <li>select the commit you want to inspect </li> <li>the history view will display the diff in the lower left pane</li> @@ -676,17 +715,20 @@ <p> <img border="0" src="images/EGit-0.7-ViewDiffInResourceHistory.png"/> </p> + <p> + <br/> + </p> <h2 id="Committing_Changes">Committing Changes</h2> <p>Modifications to a project under git version control are persisted in the git history through commits. Starting from the state checked out from the git repository modify your project until you have reached a state you are satisfied with and then commit all these changes into the repository as one single commit. Each commit represents a well defined snapshot of all the files stored in the repository. </p> <h3 id="Modifying_the_content">Modifying the content</h3> <p>To modify a project which is already shared with Git modify or delete files either within Eclipse or directly in the file system. There is no need to tell Git in advance about these operations. New files which should be version-controlled have to be explicitly put under Git version control :</p> <ul> - <li>click - <b>Team > Add</b> in the file's context menu + <li>click + <b>Team > Add</b> in the file's context menu </li> </ul> - <p>Alternatively you may display untracked files in the Commit dialog and check the - <b>Show untracked Files</b> checkbox to select them for inclusion into the commit. + <p>Alternatively you may display untracked files in the Commit dialog and check the + <b>Show untracked Files</b> checkbox to select them for inclusion into the commit. </p> <p>Label decorators e.g. in the Package Explorer View show </p> <ul> @@ -694,8 +736,8 @@ <li>files which have been added (marked with "+") </li> <li>modified files (marked with ">" in front of the filename)</li> </ul> - <p>For details see - <a href="Tasks.html#Label_Decorations">Label Decorations</a>. + <p>For details see + <a href="Tasks.html#Label_Decorations">Label Decorations</a>. </p> <p>Here is an example in the Package Explorer for</p> <ul> @@ -709,20 +751,20 @@ <img border="0" src="images/Egit-0.9-label-decorators.png"/> </p> <h3 id="Committing">Committing</h3> - <p>To commit a change click - <b>Team > Commit...</b> in the context menu of a resource in the project. + <p>To commit a change click + <b>Team > Commit...</b> in the context menu of a resource in the project. </p> <p>Git tracks all changes made to the entire repository capturing the modifications of all version-controlled files in that repository not regarding if these files reside in the same Eclipse project or not. </p> - <p>Once you have triggered the commit the - <b>Commit Dialog</b> will pop-up + <p>Once you have triggered the commit the + <b>Commit Dialog</b> will pop-up </p> <p> - <img border="0" src="images/Egit-0.9-commit-dialog.png"/> + <img border="0" src="images/Egit-0.9-commit-dialog.png"/> </p> <h4 id="Commit_Message">Commit Message</h4> <p>In the Commit Dialog you specify the commit message describing the change. </p> - <p>It is good practice to start the message with a short first line summarizing the change followed by a blank line and then the message body. In order to ensure that also git command line tools can format these messages nicely the lines shouldn't be formatted too wide (this is indicated by a grey vertical line). The commit message text is checked for errors by the Eclipse spell checker. The spell checker can be configured via the Eclipse - <b>Preferences > General > Editors > Text Editors > Spelling</b>. Click + <p>It is good practice to start the message with a short first line summarizing the change followed by a blank line and then the message body. In order to ensure that also git command line tools can format these messages nicely the lines shouldn't be formatted too wide (this is indicated by a grey vertical line). The commit message text is checked for errors by the Eclipse spell checker. The spell checker can be configured via the Eclipse + <b>Preferences > General > Editors > Text Editors > Spelling</b>. Click <b>Ctrl - 1</b> to open quick fixes which may help to fix the spelling errors. </p> <p> @@ -742,22 +784,22 @@ Signed-off-by: William Shakespeare <will.from@the.past> </pre> <p>The semantics of these tags are project or tool specific</p> <ul> - <li>If there is an entry in a but tracking system for the change to be committed it is a good idea to add it here as a bug tag</li> + <li>If there is an entry in a bug tracking system for the change to be committed it is a good idea to add it here as a bug tag</li> <li> - <a href="http://code.google.com/p/gerrit/" target="egit_external">Gerrit Code Review</a> uses the - <i>Change-Id:</i> footer to correlate different patchsets of a change evolving during the review process towards the finally accepted patch. To generate a Gerrit Change-Id click + <a href="http://code.google.com/p/gerrit/" target="egit_external">Gerrit Code Review</a> uses the + <i>Change-Id:</i> footer to correlate different patchsets of a change evolving during the review process towards the finally accepted patch. To generate a Gerrit Change-Id click <b>Compute Change-Id for Gerrit Code Review</b>; the ID will be generated on commit, until then a null Change-Id is shown as a placeholder. </li> - <li>The - <i>Signed-off-by:</i> footer is used by many projects to create a formal track record of declarations that the signing author contributed the changes under the project's license and IP rules. This way the IP provenance of a project's evolving code base can be captured on a technical level. See e.g. the - <a href="http://elinux.org/Developer_Certificate_Of_Origin" target="egit_external">Developer Certificate Of Origin</a> used by the Linux kernel project. + <li>The + <i>Signed-off-by:</i> footer is used by many projects to create a formal track record of declarations that the signing author contributed the changes under the project's license and IP rules. This way the IP provenance of a project's evolving code base can be captured on a technical level. See e.g. the + <a href="http://elinux.org/Developer_Certificate_Of_Origin" target="egit_external">Developer Certificate Of Origin</a> used by the Linux kernel project. </li> </ul> <p>Additionally this dialog controls which of the changes will be included in the commit. If you clear the checkbox in front of a file, the changes to this file will not be included in the commit. The local file in your eclipse workspace will still contain the modifications giving you the chance to commit these changes with a subsequent commit. This feature is often used to separate modifications done to a set of files into different commits. </p> <p> - <b>One example:</b> Imagine since the last commit you have fixed a bug in A.java and you have added a new method to B.java. These two modifications are logically independent from each other hence you may want to commit them in two independant commits. In this case you initate the commit, deselect B.java from the set of committed files and specify a commit message describing only the bugfix in A.java. After a succesfull first commit you just call commit again and the upcoming dialog will present you the remaining changes in B.java. Now you specify a commit message describing the addition of the method and finish the second commit. + <b>One example:</b> Imagine since the last commit you have fixed a bug in A.java and you have added a new method to B.java. These two modifications are logically independent from each other hence you may want to commit them in two independant commits. In this case you initate the commit, deselect B.java from the set of committed files and specify a commit message describing only the bugfix in A.java. After a succesfull first commit you just call commit again and the upcoming dialog will present you the remaining changes in B.java. Now you specify a commit message describing the addition of the method and finish the second commit. </p> - <p>New files you added to the project which have not been explicitly added to version control (see "Modifying the content") will be listed in the commit dialog if you select the checkbox "Show untracked Files". If you select the checkbox in front of these files in the list they will be added to the repository and committed once you press the commit button. Files which are excluded by the team ignore list or a <tt>.gitignore</tt> file or which are derived (e.g. the bin folder in java projects) will not be shown here. If you have no other changes in your repository than such untracked files the checkbox + <p>New files you added to the project which have not been explicitly added to version control (see "Modifying the content") will be listed in the commit dialog if you select the checkbox "Show untracked Files". If you select the checkbox in front of these files in the list they will be added to the repository and committed once you press the commit button. Files which are excluded by the team ignore list or a <tt>.gitignore</tt> file or which are derived (e.g. the bin folder in java projects) will not be shown here. If you have no other changes in your repository than such untracked files the checkbox <b>Show untracked Files</b> is selected by default. </p> <h4 id="Amending_Commits">Amending Commits</h4> @@ -766,22 +808,22 @@ Signed-off-by: William Shakespeare <will.from@the.past> <b>Note:</b> do not amend commits if they have already been published to a shared repository since this may disturb others if they already based their changes on the published change. </p> <p> - <b>Amend example:</b> + <b>Amend example:</b> - <br/>Imagine you have committed a change to a file containing a typo + <br/>Imagine you have committed a change to a file containing a typo </p> <p> - <img border="0" src="images/EGit-Typo.png"/> + <img border="0" src="images/EGit-Typo.png"/> </p> <p>After committing the change you detect a typo. In order to correct this typo and the corresponding commit you just fix the typo in the source file </p> <p> - <img border="0" src="images/EGit-Corrected.png"/> + <img border="0" src="images/EGit-Corrected.png"/> </p> - <p>then open the Commit Dialog again and select the option - <b>Amend previous commit</b>. + <p>then open the Commit Dialog again and select the option + <b>Amend previous commit</b>. </p> <p> - <img border="0" src="images/Egit-0.9-commit-dialog-amend.png"/> + <img border="0" src="images/Egit-0.9-commit-dialog-amend.png"/> </p> <p>The commit message of your previous commit (the one you want to replace) is filled into the "Commit Message" field. This gives you the chance not only to correct errors in the content of the version-controlled files but to also correct errors (e.g. typos) in the commit message describing your change. </p> <p>As an alternative to amending you could just commit the corrected version as a subsequent commit. But the first commit containing the typo is of no use to anybody and in order not to clutter the history of your project with unneeded commits you may decide to amend the commit. </p> @@ -790,12 +832,12 @@ Signed-off-by: William Shakespeare <will.from@the.past> <h3 id="Reverting_changes_in_the_working_tree">Reverting changes in the working tree</h3> <h4 id="Replace_with_File_in_Git_Index">Replace with File in Git Index</h4> <p>Changes which are not yet committed and not yet staged can be reverted for a set of selected files. - Select the file(s) in the Package Explorer or an analogous view and click + Select the file(s) in the Package Explorer or an analogous view and click <b>Replace With > File in Git Index</b>. </p> <h4 id="Replace_with_HEAD">Replace with HEAD</h4> - <p>This feature is currently not available on single file level. You can use - <b>Reset to</b> with option + <p>This feature is currently not available on single file level. You can use + <b>Reset to</b> with option <b>hard</b> to forcefully reset the entire working tree of your repository back to the state of the HEAD commit (See "Resetting your current HEAD" below). This operation will revert all changes in the working tree and the index. You can't do it on a selected set of files using EGit yet. </p> <h3 id="Resetting_your_current_HEAD">Resetting your current HEAD</h3> @@ -813,40 +855,43 @@ Signed-off-by: William Shakespeare <will.from@the.past> </li> </ul> <h4 id="Reset_to_specific_branch_or_tag">Reset to specific branch or tag</h4> - <p>Select + <p>Select <b>Team -> Reset...</b> on a project. This opens a dialog where you can select a branch or a tag. </p> <h4 id="Reset_to_a_specific_commit">Reset to a specific commit</h4> - <p>Select a commit in the History view and open the context menu. Here you find the entries - <b>Hard reset</b>, - <b>Mixed reset</b> and + <p>Select a commit in the History view and open the context menu. Here you find the entries + <b>Hard reset</b>, + <b>Mixed reset</b> and <b>Soft reset</b>. </p> <h4 id="Revert_all_local_and_staged_changes">Revert all local and staged changes</h4> - <p>This can be done as a special case of reset. If you reset to the current HEAD (normally the last commit on your branch) with the option + <p>This can be done as a special case of reset. If you reset to the current HEAD (normally the last commit on your branch) with the option <b>hard</b> you overwrite the working tree and the index with the content of the HEAD. You can do this in three ways: </p> <ul> - <li>Select - <b>Team > Reset...</b> on a project. In the dialog select HEAD or your current branch and switch the radio button to + <li>Select + <b>Team > Reset...</b> on a project. In the dialog select HEAD or your current branch and switch the radio button to <b>hard</b>. </li> - <li>Right click and select - <b>Reset...</b> on any branch or tag in the Repositories view. This opens a dialog which lets you decide on the reset type. Choose + <li>Right click and select + <b>Reset...</b> on any branch or tag in the Repositories view. This opens a dialog which lets you decide on the reset type. Choose <b>hard</b> here. </li> - <li>Open the context menu on the HEAD commit in the history view and select + <li>Open the context menu on the HEAD commit in the history view and select <b>Hard Reset</b>. </li> </ul> + <p> + <br/> + </p> <h2 id="Branching">Branching</h2> <h3 id="Branching_in_the_Repositories_View">Branching in the Repositories View</h3> - <p>The Repositories View + <p>The Repositories View <a href="Tasks.html#Branch_and_Tag_Support">supports</a> the following branching actions: </p> <ul> <li> - <a href="Tasks.html#Check-out_of_Branches_and_Tags">Checkout of branches</a> + <a href="Tasks.html#Check-out_of_Branches_and_Tags">Checkout branches</a> </li> <li> <a href="Tasks.html#Creation_and_Deletion_of_Branches">Creation and deletion of branches</a> @@ -868,37 +913,48 @@ Signed-off-by: William Shakespeare <will.from@the.past> <h4 id="Creating_a_New_Local_Branch">Creating a New Local Branch</h4> <ul> <li>Select the branch your new branch should be based on</li> - <li>Click + <li>Click <b>New Branch</b> </li> - <li>Enter the branch name and click + <li>Enter the branch name and click <b>OK</b> </li> </ul> + <p> + <b>Note:</b> If you create a local branch based on a remote tracking branch a tracking relationship will be configured automatically. When this local branch is checked out a subsequent + <b>Pull</b> operation will pull new changes into the local branch from the remote tracking branch configured to be tracked by this local branch. You may view and edit this configuration in the + <a href="Tasks.html#Repository_Configuration">repository configuration</a>. + </p> <h4 id="Renaming_an_Existing_Branch">Renaming an Existing Branch</h4> <ul> <li>Select the branch you want to rename</li> - <li>Click + <li>Click <b>Rename</b> </li> - <li>Enter the new branch name and click + <li>Enter the new branch name and click <b>OK</b> </li> </ul> <h4 id="Checking_out_a_Branch">Checking out a Branch</h4> <ul> <li>Select the branch you want to check out</li> - <li>Click + <li>Click <b>Checkout</b> </li> </ul> + <p> + <br/> + </p> <h3 id="Branching_in_the_History_View">Branching in the History View</h3> - <p>In history view a new branch can be created based on a given commit: select a commit in the history view and execute + <p>In history view a new branch can be created based on a given commit: select a commit in the history view and execute <b>Create Branch...</b> on the context menu. A dialog for branch creation appears: </p> <p> <img border="0" src="images/CreateBranch.png"/> </p> + <p> + <br/> + </p> <h2 id="Merging">Merging</h2> <p>A merge incorporates changes from named commits (since the time their histories diverged from the current branch) into the current branch. </p> <h3 id="Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</h3> @@ -909,7 +965,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> </ul> <h4 id="Starting_merge_from_the_team_menu">Starting merge from the team menu</h4> <p>In the Package Explorer or Navigator, open the context menu on a project node. - Select + Select <b>Team > Merge...</b> </p> <p>Now the merge dialog opens:</p> @@ -918,15 +974,20 @@ Signed-off-by: William Shakespeare <will.from@the.past> </p> <p>On the dialog, select a branch or a tag you want to merge with your current branch. </p> <h4 id="Starting_merge_from_the_Git_Repositories_View">Starting merge from the Git Repositories View</h4> - <p>You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See - <a href="Tasks.html#Merging_a_Branch_or_a_Tag">Merging a Branch or a Tag</a> for further details. + <p>You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See + <a href="Tasks.html#Merging_a_Branch_or_a_Tag">Merging a Branch or a Tag</a> for further details. </p> <h4 id="Possible_merge_results">Possible merge results</h4> <p>After pressing the Merge button, the following scenarios can occur:</p> <ul> - <li>Already up to date: Your current branch points to a commit that has the selected branch or tag as predecessor. In this case nothing is changed.</li> - <li>Fast-forward: Your current branch points to a commit that is a predecessor of the selected branch or tag. In this case your branch is moved and points to the selected branch or tag; this new HEAD is checked out to the working tree. Fast-forward is very common when working with remote repositories: When a remote tracking branch is updated, the merge with the corresponding branch generally is a fast-forward. You can perform a pull by fetching the remote branch (e.g. origin/master) and merging it into the corresponding local branch (e.g. master).</li> - <li>Real merge: When neither of the conditions above apply egit triggers a merge of the commits. There are two possible outcomes: If no conflicts occur the current branch will point to a newly created merge commit; if conflicts occur the conflicting files will be marked with label decorators (see + <li> + <i>Already up to date</i>: Your current branch points to a commit that has the selected branch or tag as predecessor. In this case nothing is changed. + </li> + <li> + <i>Fast-forward</i>: Your current branch points to a commit that is a predecessor of the selected branch or tag. In this case your branch is moved and points to the selected branch or tag; this new HEAD is checked out to the working tree. Fast-forward is very common when working with remote repositories: When a remote tracking branch is updated, the merge with the corresponding branch generally is a fast-forward. You can perform a pull by fetching the remote branch (e.g. origin/master) and merging it into the corresponding local branch (e.g. master). + </li> + <li> + <i>Real merge</i>: When neither of the conditions above apply egit triggers a merge of the commits. There are two possible outcomes: If no conflicts occur the current branch will point to a newly created merge commit; if conflicts occur the conflicting files will be marked with label decorators (see <a href="Tasks.html#Resolving_a_merge_conflict">Resolving a merge conflict</a> for further actions in case of merge conflicts). </li> </ul> @@ -939,17 +1000,49 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p>On the second line you see the new HEAD commit in case of a successful merge (Already-up-to-date, Fast-forward or Merged).</p> <p>In the table you see the commits which were merged.</p> <h3 id="Resolving_a_merge_conflict">Resolving a merge conflict</h3> - <p>A merge can result in conflicts which require user action. This is the case when the content of files cannot be merged automatically. These conflicts are marked with a label decoration in the navigation tree. The merge conflicts in the content of files are presented with textual conflict markers (see + <p>A merge can result in conflicts which require user action. This is the case when the content of files cannot be merged automatically. These conflicts are marked with a label decoration in the navigation tree. The merge conflicts in the content of files are presented with textual conflict markers (see <a href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented" target="egit_external">http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented</a> for more details). </p> + <p> + <img border="0" src="images/Egit-0.10-merge-conflict.png"/> + </p> + <h4 id="Using_Merge_Tool">Using Merge Tool</h4> + <ul> + <li>select the top level resource showing the red conflict label decorator</li> + <li>click + <b>Team > Merge Tool</b> + </li> + <li>select the merge mode + <i>Use HEAD (the last local version) of conflicting files" and click '''OK</i>' + </li> + </ul> + <p> + <img border="0" src="images/Egit-0.10-select-merge-mode.png"/> + </p> + <ul> + <li>the merge editor opens showing the working tree version in the left pane and the version to be merged in the right pane</li> + </ul> + <p> + <img border="0" src="images/Egit-0.10-merge-tool.png"/> + </p> + <ul> + <li>edit the working tree version until you are happy with it</li> + <li> + <b>Team > Add</b> the merged resource to mark the conflict as resolved + </li> + <li>commit the merge commit via + <b>Team > Commit</b> + </li> + </ul> + <h4 id="Manual_conflict_resolution">Manual conflict resolution</h4> <p>To resolve a conflict you have to do the following steps:</p> <ul> <li>Navigate to the conflicting resource</li> <li>Edit the content of the conflicting resource</li> - <li>Tell EGit that the conflict is resolved with + <li>Tell EGit that the conflict is resolved with <b>Team > Add</b> </li> - <li>Commit the conflict resolution with + <li>Commit the conflict resolution with <b>Team > Commit</b> </li> </ul> @@ -959,13 +1052,13 @@ Signed-off-by: William Shakespeare <will.from@the.past> <img border="0" src="images/Conflicts.png"/> </p> <h4 id="Editing_conflicting_files">Editing conflicting files</h4> - <p>In the file content, the area where a pair of conflicting changes happened is marked with markers <<<<<<<, =======, and >>>>>>>. The part before the ======= is typically your side, and the part afterwards is typically their side (see - <a href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented" target="egit_external">http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented</a> for more details). + <p>In the file content, the area where a pair of conflicting changes happened is marked with markers <<<<<<<, =======, and >>>>>>>. The part before the ======= is typically your side, and the part afterwards is typically their side (see + <a href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented" target="egit_external">http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented</a> for more details). </p> <p>Open the file in an editor, edit the content and save the editor.</p> <p>Note that this step is not mandatory. EGit does not check the content to decide if a conflict is resolved. The next step is the relevant one.</p> <h4 id="Adding_conflict_resolution_to_the_git_index">Adding conflict resolution to the git index</h4> - <p>Once you are finished with editing a file select + <p>Once you are finished with editing a file select <b>Team > Add</b> to add the conflict resolution to the git index. You can do it on a folder or the whole project to resolve all conflicts at once. </p> <p>When you have resolved all conflicts the textual repository label decoration changes to "Merged". There are no conflict markers anymore.</p> @@ -974,7 +1067,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> </p> <h4 id="Committing_a_merge">Committing a merge</h4> <p>When the repository is in state "Merged" (as is indicated with the textual label decorator "|Conflicts" attached to the repository name) the merge can finally be committed.</p> - <p>Select + <p>Select <b>Team > Commit...</b> anywhere in the navigation tree. The commit dialog opens with a slightly different look compared to a normal commit: </p> <ul> @@ -984,15 +1077,232 @@ Signed-off-by: William Shakespeare <will.from@the.past> <li>it is not possible to uncheck the checkboxes. This guarantees that all resolved conflicts are committed.</li> </ul> <p>After pressing the "Commit" Button the merge is completed.</p> - <h3 id="Aborting_merge">Aborting merge</h3> + <h3 id="Aborting_Merge">Aborting Merge</h3> <p>If a merge resulted in conflicts you can abort the merge with a hard reset to the current branch. This can be done in state "Conflicts" and in state "Merged", i.e. before and after you have resolved the conflicts. </p> - <p>The hard reset can be done from the team menu, the Git Repositories View and the History View. See [ + <p>The hard reset can be done from the team menu, the Git Repositories View or the History View. See [ <a href="Tasks.html#Revert_all_local_and_staged_changes">Revert all local and staged changes</a> for more details. </p> + <p> + <br/> + </p> + <h2 id="Rebasing">Rebasing</h2> + <h3 id="Rebase_Introduction">Rebase Introduction</h3> + <p>Rebase applies a chain of commits onto a given commit. A typical scenario is the development of some feature on a "topic" branch which was created from a "master" branch at some point in time. When "master" is updated with changes e.g. from other developers while "topic" is still under development, it may become necessary to incorporate these changes into "topic". + <br/> + </p> + <p>Let's assume we start development on "topic" by creating the "topic" branch from master. At this point, both "master" and "topic" point to commit "E". When the first commit ("A") is added to "topic", the commit history of the repository looks like this: + <br/> + </p> + <pre> A topic + / + D---E master +</pre> + <p> + Now, let's assume that there were some more commits on "topic" and as well some more commits on "master" (for example, "master" may track some remote repository and there were some changes in that remote repository that have been pulled into "master"): + <br/> + </p> + <pre> A---B---C topic + / + D---E---F---G master +</pre> + <p> + Now, in order to incorporate the changes in "master" into "topic", a Rebase of "topic" onto "master" would produce + <br/> + </p> + <pre> A'--B'--C' topic + / + D---E---F---G master +</pre> + <p> + + <br/> Technically, the sequence of commits that are contained in "topic" but not in "master" are applied (that is, cherry-picked) on top of "master" one by one. + <br/> + </p> + <p>Note that the commits A, B, C are neither lost nor changed, instead a new chain of commits A', B', C' with the same changes and commit messages as the original commits (but different commit IDs) will be created. The old commits A, B, C are still around in the object database but not visible anymore as they are no longer reachable from any branch. A', B', C' are different from the old ones as they now also contain changes F and G.</p> + <h3 id="Rebase.2C_A_Simple_Example">Rebase, A Simple Example</h3> + <p>Let's have a look at some simple example: we have a text file "FamousWords.txt" which initially might have some content like </p> + <pre>Chapter 1 +Once upon a time... + +Chapter 2 +To be or not to be +</pre> + <p> + Now, in "topic", two commits are created, the first one adding a French translation to Chapter 2, and another one adding a German translation: </p> + <p>After first change in "topic": + <br/> + </p> + <pre>Chapter 1 +Once upon a time... + +Chapter 2 +To be or not to be +Ètre ou non ètre pas + +</pre> + <p> + After second change in "topic": + <br/> + </p> + <pre>Chapter 1 +Once upon a time... + +Chapter 2 +To be or not to be +Ètre ou non ètre pas +Sein oder nicht sein +</pre> + <p> + At the same time, the file was changed in "master" by adding two commits adding French and German translations to Chapter 1: + <br/> + </p> + <pre>Chapter 1 +Once upon a time... +Il était une fois +Es war einmal + +Chapter 2 +To be or not to be +</pre> + <p> + The commit history looks like this: </p> + <p> + <img border="0" src="images/EGit-0.10-MergeDemoHistory.png"/> + </p> + <p>Now, if "topic" is rebased onto "master", the two changes in topic are applied in the same sequence as they were applied during the evolution of "topic". </p> + <p>The result is a merged version of "FamousWords.txt": + <br/> + </p> + <pre>Chapter 1 +Once upon a time... +Il était une fois +Es war einmal + +Chapter 2 +To be or not to be +Ètre ou non ètre pas +Sein oder nicht sein + +</pre> + <p>and a commit history with the commit history of "topic" on top of the current "master": + <br/> + </p> + <p> + <img border="0" src="images/EGit-0.10-MergeDemoHistoryAfterRebase.png"/> + </p> + <h3 id="The_Real_World:_Rebase_Conflicts">The Real World: Rebase Conflicts</h3> + <p>Up to now, we have assumed that the changes in "topic" can be auto-merged into "master". In the real world, however, it may happend that you encounter conflicts during rebase. Now, if a commit that is to be cherry-picked contains changes that conflict with changes in "master", the rebase operation is interrupted after applying the conflicting change; the conflicts are visualized in the usual way (with conflict markers) and the user gets a chance to decide whether to</p> + <ul> + <li>resolve these conflicts manually,</li> + <li>skip the current commit, or </li> + <li>abort the rebase completely</li> + </ul> + <p>If + <b>Resolve Conflicts</b> is chosen, and the conflicts have been resolved manually, the changes must be "Added", and then rebase can be resumed, i.e. the next commit in the chain will be applied. + </p> + <p>If + <b>Skip</b> was chosen, the conflicting changes will be reverted and the next commit in the chain will be applied. + </p> + <p>If + <b>Abort</b> was chosen, the rebase operation will be completely rolled back, returning the Repository into its original state before the rebase was started. + This process is repeated until the last commit was applied successfully or skipped. Finally, the "topic" branch will be changed to point to the last commit. + </p> + <p>To understand "Skip" better, let's look back to the introduction above. If we assume that commit "B" causes some conflicts with the current "master", the user might decide to simply skip "B"; the new commit history after the rebase would then look like this:</p> + <pre> A'--C' topic + / + D---E---F---G master +</pre> + <h3 id="Starting_Rebase">Starting Rebase</h3> + <p>Rebase is available in the Git Repositories View. On Repository nodes, + <b>Rebase...</b> opens a dialog asking the user to select a branch that is not checked out; the currently checked out branch will then be rebased onto the selected branch. On "Branch" nodes (both Local and Remote Tracking branches, but not on the currently checked out branch), + <b>Rebase</b> immediately rebases the currently checked out branch onto the selected branch: + </p> + <p> + <img border="0" src="images/EGit-0.10-StartRebaseFromRepoView.png"/> + </p> + <h3 id="Rebase_Confirmation_Dialog">Rebase Confirmation Dialog</h3> + <p>If Rebase was successful, a confirmation dialog will be displayed; this dialog can be suppressed by ticking a checkbox; a preference on the Git preference page allows to make the dialogs appear again. If the dialog is suppressed, an "Information" message is written to the Eclipse log instead.</p> + <h3 id="Rebase_Conflicts">Rebase Conflicts</h3> + <p>If a conflict occurs during rebase, a dialog is shown giving some information about the commit that caused the conflict. By selecting a radio button, you can decide whether to</p> + <ul> + <li>Start the Merge Tool to resolve the conflicts manually</li> + <li>Skip the current commit</li> + <li>Abort the rebase altogether</li> + <li>Do nothing (return to the workbench), this is equivalent to hitting "Escape":</li> + </ul> + <p> + <img border="0" src="images/EGit-0.10-RebaseConflictDialog.png"/> + </p> + <p>Unless "Skip" or "Abort" was chosen in the dialog, the conflicts must be resolved manually by editing the conflicting files. When done with editing, the files must be declared as being resolved by "Adding" them to the index.</p> + <p>After all conflicts have been resolved, Rebase can be resumed by right-clicking on the Repository node in the Git Repositories View and selecting Rebase > Continue.</p> + <p>The "Skip" and "Abort" options are also available from the Git Repositories View by right-clicking on the Repository node and selecting Rebase > Skip and Rebase > Abort, respectively.</p> + <p>The Merge Tool can also be started from the corresponding entry in the Team menu.</p> + <h3 id="Aborting_Rebase">Aborting Rebase</h3> + <p>As long as the Repository is in "Rebasing" state, the user can always abort the rebase in the Git Repositories View using the menu action "Rebase > Abort" which is available on the Repository node.</p> + <h3 id="Rebase_Limitation">Rebase Limitation</h3> + <p>In EGit 0.10 rebase is not yet able to handle all possible version graphs. If the graph is too complicated rebase will abort with an error message. As a workaround until these more complex graphs are also supported by EGit's rebase you may instead use native git from the command line.</p> + <h2 id="Cherry_Picking">Cherry Picking</h2> + <h3 id="Cherry-pick_Introduction">Cherry-pick Introduction</h3> + <p>A given commit + <i>C'' on branch ''stable-1.0</i> contains a set of changes you would like to integrate in your current development on branch + <i>master</i>. + </p> + <pre> A--B--C--D stable-1.0 + / + D---E---F---G master HEAD +</pre> + <p>Cherry-pick the commit + <i>C'' to create a new commit ''C' '' on top of the head commit of the currently checked out branch ''master</i>. + <i>C' '' will then contain the changes performed in ''C</i> applied onto the HEAD of the currently checked out branch + <i>master</i>. + </p> + <pre> A--B--C--D stable-1.0 + / + D---E---F---G--C' master HEAD +</pre> + <h3 id="Cherry-pick_Example">Cherry-pick Example</h3> + <p>You are currently working on branch "feature2" (HEAD). There is a commit "feature 1" in another branch. + <br/> + You want to integrate the changes performed by commit "feature 1" into your current development on branch "feature 2". + </p> + <ul> + <li>In the History View select commit "feature 1" and click + <b>Cherry-pick</b>: + </li> + </ul> + <p> + <img border="0" src="images/CherryPick1.png"/> + </p> + <ul> + <li>As result you get a new commit "feature 1" at the tip of your current branch "feature" containing the changes of "feature 1":</li> + </ul> + <p> + <img border="0" src="images/CherryPick2.png"/> + </p> + <ul> + <li>Cherry-picking can encounter conflicts. In this case conflict markers are rendered into the affected sources:</li> + </ul> + <p> + <img border="0" src="images/CherryPick3.png"/> + </p> + <ul> + <li>Resolve the conflicts by editing the corresponding sources as described in + <a href="Tasks.html#Resolving_a_merge_conflict">Resolving a merge conflict</a> + </li> + <li> + <b>Team > Add</b> the files you edited to mark the conflicts resolved + </li> + <li>Commit the changes using + <b>Team > Commit</b> + </li> + </ul> + <p> + <br/> + </p> <h2 id="Tagging">Tagging</h2> <h3 id="Creating_a_Tag">Creating a Tag</h3> <ul> - <li>Select + <li>Select <b>Team > Tag...</b> from the project context menu. </li> </ul> @@ -1003,11 +1313,11 @@ Signed-off-by: William Shakespeare <will.from@the.past> <li>Enter the tag name</li> <li>Enter the tag message</li> <li>Optionally select the commit you want to tag (default is HEAD)</li> - <li>Click + <li>Click <b>OK</b> to create the annotated tag </li> </ul> - <p>Tags can also be created in the history view: select a commit and execute + <p>Tags can also be created in the history view: select a commit and execute <b>Create Tag...</b> in the context menu. The tag will be created on the selected commit: </p> <p> @@ -1018,12 +1328,12 @@ Signed-off-by: William Shakespeare <will.from@the.past> <ul> <li>If you didn't yet push this out just replace the tag and you are done.</li> <li> - <b>If it's already published you shouldn't replace the tag</b> but use a new name since otherwise you have to tell everybody who got the old tag to replace it manually with your updated one. This is because, Git does not (and it should not) change tags behind users back. So if somebody already got the old tag, doing a git pull on your tree shouldn't just make them overwrite the old one.}} + <b>If it's already published you shouldn't replace the tag</b> but use a new name since otherwise you have to tell everybody who got the old tag to replace it manually with your updated one. This is because, Git does not (and it should not) change tags behind users back. So if somebody already got the old tag, doing a git pull on your tree shouldn't just make them overwrite the old one. </li> </ul> <p>So if your old tag wasn't yet pushed you may correct it in the following way :</p> <ul> - <li>Select + <li>Select <b>Team > Tag...</b> from the project context menu. </li> </ul> @@ -1033,17 +1343,20 @@ Signed-off-by: William Shakespeare <will.from@the.past> <ul> <li>Select the tag you want to replace from the list of existing tags</li> <li>or start typing any part of the tag you look for into the Tag Name field, this will filter the list of existing tags to those tags which contain the string you are typing, then select the tag you want to replace</li> - <li>Mark the checkbox + <li>Mark the checkbox <b>Force replace existing tag</b> </li> - <li>Change the tag and press + <li>Change the tag and press <b>OK</b> </li> </ul> <h3 id="Light-weight_and_Signed_Tags">Light-weight and Signed Tags</h3> <p>Light-weight and signed tags are not yet supported by EGit, use command line <tt> <b>git tag</b></tt> or <tt> - <b>git tag -s</b></tt> as a workaround + <b>git tag -s</b></tt> instead. + </p> + <p> + <br/> </p> <h2 id="Patches">Patches</h2> <h3 id="Creating_Patches">Creating Patches</h3> @@ -1069,11 +1382,11 @@ Signed-off-by: William Shakespeare <will.from@the.past> </p> <p>The name of the patch file is created from the first line of the commit message.</p> <p>On the second page you can change the patch format. </p> - <p>Currently there is one check box: - <b>Export in git patch format</b>. + <p>Currently there is one check box: + <b>Export in git patch format</b>. </p> <ul> - <li>If you do not check it (this is the default) the patch can be applied with the eclipse + <li>If you do not check it (this is the default) the patch can be applied with the eclipse <b>Apply Patch...</b> wizard. The paths are relative to the eclipse projects and do not contain prefixes (like <tt> <b>git format-patch --no-prefix</b></tt> on the git command line). </li> @@ -1082,9 +1395,12 @@ Signed-off-by: William Shakespeare <will.from@the.past> </li> </ul> <h3 id="Applying_Patches">Applying Patches</h3> - <p>Currently it s not possible to apply patches in git format. It is possible to apply patches using the standard eclipse format using + <p>Currently it s not possible to apply patches in git format. It is possible to apply patches using the standard eclipse format using <b>Team > Apply Patch...</b>. </p> + <p> + <br/> + </p> <h2 id="Managing_Repositories">Managing Repositories</h2> <p>The "Git Repositories View" is the primary UI element to facilitate working with multiple Repositories simultaneously (i.e. within one Eclipse Workspace).</p> <p>This view can be opened using the menu path @@ -1103,7 +1419,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> <br/> - <b>Show In... > Git Repositories</b> or + <b>Show In... > Git Repositories</b> or <b>Team > Show in Repositories View</b> </p> <p>on any resource to open the view.</p> @@ -1116,34 +1432,34 @@ Signed-off-by: William Shakespeare <will.from@the.past> <li>Adding a Repository by pasting a Git Repository path to the view</li> </ol> <h4 id="Adding_a_Repository_manually">Adding a Repository manually</h4> - <p>You can add a Repository from your local file system to the Git Repositories View without cloning it. This can be helpful if you are setting up a new Eclipse workspace and want to re-use your Git Repositories. Use the + <p>You can add a Repository from your local file system to the Git Repositories View without cloning it. This can be helpful if you are setting up a new Eclipse workspace and want to re-use your Git Repositories. Use the <b>Add an existing Git Repository</b> button from the view's toolbar: </p> <p> <img border="0" src="images/RepoMgrAddRepositoryIcon.png"/> </p> - <p>A dialog will appear prompting you for a directory of your local file system. After selecting the correct directory, you can hit the - <b>Search</b> button to see a list of Git Repositories in this directory. You can then select some or all found Repositories and add them to the view using + <p>A dialog will appear prompting you for a directory of your local file system. After selecting the correct directory, you can hit the + <b>Search</b> button to see a list of Git Repositories in this directory. You can then select some or all found Repositories and add them to the view using <b>OK</b>: </p> <p> <img border="0" src="images/RepoMgrSearchDialog.png"/> </p> <h4 id="Cloning_a_Repository_2">Cloning a Repository</h4> - <p>In order to clone a Repository, refer to + <p>In order to clone a Repository, refer to <a href="Tasks.html#Cloning_a_Repository">Cloning remote Repositories</a>. After a successful clone operation, the newly cloned Repository should appear in the Git Repositories View automatically. </p> - <p>You can also use the + <p>You can also use the <b>Clone a Git Repository</b> button from the view's toolbar to start the Clone wizard: </p> <p> <img border="0" src="images/RepoMgrCloneRepositoryIcon.png"/> </p> - <p>Please refer to + <p>Please refer to <a href="Tasks.html#Cloning_a_Repository">Cloning remote Repositories</a> about how to use the wizard. </p> <h4 id="Creating_a_Repository">Creating a Repository</h4> - <p>You can create a new, empty repository on the local file system. This is useful if you later on want to create one or more new projects below this repository. Another usecase is to create a new bare repository where you can push to. Use the + <p>You can create a new, empty repository on the local file system. This is useful if you later on want to create one or more new projects below this repository. Another usecase is to create a new bare repository where you can push to. Use the <b>Create a new Git Repository</b> button from the view's toolbar: </p> <p> @@ -1153,21 +1469,43 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p> <img border="0" src="images/RepoMgrCreateRepositoryDialog.png"/> </p> - <p>If you select the checkbox + <p>If you select the checkbox <b>Create as Bare Repository</b> the new repository will not have a working directory. You then can only add content by pushing changes from another repository. </p> - <h4 id="Adding_a_Repository_using_copy_and_paste">Adding a Repository using copy and paste</h4> + <h4 id="Adding_a_Repository_using_Copy_and_Paste">Adding a Repository using Copy and Paste</h4> <p>As a shortcut, it is also possible to paste the local file system path of a Git repository from the clipboard into this view. In order to do so, copy the path of a Git repository (the full path of its <code>.git</code> folder) to the clipboard, then open the context menu on the view panel:</p> <p> <img border="0" src="images/RepoMgrPasteRepositoryPath.png"/> </p> - <p>or click + <p>or click <b>Edit > Paste</b> from the main menu (or the corresponding keyboard shortcut). If the clipboard content is not suitable, an error popup will be displayed, otherwise the added Repository should appear automatically. </p> <p>After the view has been populated with some repositories, it should look like this:</p> <p> <img border="0" src="images/RepoMgrViewWithRepos.png"/> </p> + <h3 id="Removing_Repositories">Removing Repositories</h3> + <h4 id="Removing_a_Repository_from_the_Repositories_View">Removing a Repository from the Repositories View</h4> + <p>In order to remove a repository from the Repositories View select a repository and click "Remove Repository" </p> + <p> + <img border="0" src="images/Egit-0.10-RemoveRepository.png"/> + </p> + <h4 id="Deleting_a_Repository">Deleting a Repository</h4> + <p>In order to delete a repository, select it in the Repositories View and click "Delete Repository".</p> + <p> + <img border="0" src="images/Egit-0.10-DeleteRepository.png"/> + </p> + <p>Then confirm that you want to delete the repository</p> + <p> + <img border="0" src="images/Egit-0.10-ConfirmRepositoryDeletion.png"/> + </p> + <p>and decide if you want to delete projects contained in the repository from the Eclipse workspace.</p> + <p> + <img border="0" src="images/Egit-0.10-ConfirmProjectRemoval.png"/> + </p> + <p> + <br/> + </p> <h3 id="Structure_of_the_Git_Repositories_View">Structure of the Git Repositories View</h3> <p>The following screenshot shows the topmost two levels of the Git Repositories View:</p> <p> @@ -1183,11 +1521,11 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p> <img border="0" src="images/RepoMgrImportNodes.png"/> </p> - <p>The rationale for offering the - <b>Import Projects...</b> action on several nodes is that some of the wizards used for importing projects can take the file system directory into account, for example the + <p>The rationale for offering the + <b>Import Projects...</b> action on several nodes is that some of the wizards used for importing projects can take the file system directory into account, for example the <b>Import Existing Projects</b> wizard. If the import is started from the "Repository" or the "Working Directory" node, the working directory of the repository is set as context, otherwise the directory corresponding to the currently selected "Folder" node. </p> - <p>The details of project import are discussed in + <p>The details of project import are discussed in <a href="Tasks.html#Use_the_New_Projects_Wizard">Use the New Projects Wizard</a>. </p> <h4 id="Branch_and_Tag_Support">Branch and Tag Support</h4> @@ -1206,22 +1544,22 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p>You can change the source branch using the drop-down. By default, the newly created branch will be checked out after creation. Deselect the corresponding checkbox on the wizard if you don't want this to happen.</p> <p>Branch deletion is done using the corresponding context menu entry.</p> <h5 id="Merging_a_Branch_or_a_Tag">Merging a Branch or a Tag</h5> - <p>You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See + <p>You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See <a href="Tasks.html#Merging">Merging</a> for further details of the merging features. </p> <ul> - <li>When you select any branch node other than the currently checked out branch or any tag node, use - <b>Merge</b> to directly trigger a merge into the currently checked out branch. + <li>When you select any branch node other than the currently checked out branch or any tag node, use + <b>Merge</b> to directly trigger a merge into the currently checked out branch. </li> </ul> <ul> - <li>When you select the repository node or the currently checked out branch, use - <b>Merge...</b> to open the merge dialog. The merge dialog is described at + <li>When you select the repository node or the currently checked out branch, use + <b>Merge...</b> to open the merge dialog. The merge dialog is described at <a href="Tasks.html#Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</a>. </li> </ul> <h5 id="Synchronizing_with_a_Branch_or_a_Tag">Synchronizing with a Branch or a Tag</h5> - <p>You can perform a comparison of the changes in your HEAD with the changes done in any other branch or tag. Right click and select + <p>You can perform a comparison of the changes in your HEAD with the changes done in any other branch or tag. Right click and select <b>Synchronize...</b> on any branch or tag. Then the eclipse synchronize view opens which contains a representation of the changes that are contained in your HEAD but not on the other branch or tag (outgoing change) or vice versa (incoming change). Please refer to the documentation of the synchronize feature for further details. </p> <h5 id="Determining_the_Checked-out_Branch">Determining the Checked-out Branch</h5> @@ -1230,8 +1568,8 @@ Signed-off-by: William Shakespeare <will.from@the.past> <img border="0" src="images/RepoMgrCheckedOutBranch.png"/> </p> <h5 id="Resetting_to_a_Branch_or_a_Tag">Resetting to a Branch or a Tag</h5> - <p>Right click and select - <b>Reset...</b> on any branch or tag. This opens a dialog which lets you decide on the reset type. See + <p>Right click and select + <b>Reset...</b> on any branch or tag. This opens a dialog which lets you decide on the reset type. See <a href="Tasks.html#Resetting_your_current_HEAD">Resetting you current HEAD</a> for further details. </p> <h5 id=".22Detached.22_HEAD">"Detached" HEAD</h5> @@ -1241,23 +1579,23 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p> <img border="0" src="images/RepoMgrOpenTextEditor.png"/> </p> - <p>Also, on all file and folder nodes as well as on the "Repository" node, an option is offered to copy the (file-system specific) path to the clipboard. This is sometimes useful when the path is needed, for example to open a directory using a file browser or to copy and paste Repositories between view instances (see above about how to add Repositories to the view). The - <b>Copy to Clipboard</b> action is also available using + <p>Also, on all file and folder nodes as well as on the "Repository" node, an option is offered to copy the (file-system specific) path to the clipboard. This is sometimes useful when the path is needed, for example to open a directory using a file browser or to copy and paste Repositories between view instances (see above about how to add Repositories to the view). The + <b>Copy to Clipboard</b> action is also available using <b>Edit > Copy</b> (or the corresponding keyboard shortcut). </p> <h4 id="Repository_Configuration">Repository Configuration</h4> - <p>Integration with the generic "Properties" view in Eclipse allows to view and edit the Git Configuration (global and repository-specific configuration). If the "Properties" view is open, it is updated automatically when a "Repository" node is selected. For convenience, an + <p>Integration with the generic "Properties" view in Eclipse allows to view and edit the Git Configuration (global and repository-specific configuration). If the "Properties" view is open, it is updated automatically when a "Repository" node is selected. For convenience, an <b>Open Properties view</b> action is provided in the context menu: </p> <p> <img border="0" src="images/RepoMgrPropertiesView.png"/> </p> - <p>With a drop down box (left red box in the screen shot) you can switch between the display of the Repository Configutarion, the Global Configuration and a view which aggregates both. If the view displays the Repository Configutarion or the Global Configuration you can open an editor dialog with the - <b>Edit</b> button (right red box in the screen shot). The editor dialog has the same functionality as the preference page + <p>With a drop down box (left red box in the screen shot) you can switch between the display of the Repository Configutarion, the Global Configuration and a view which aggregates both. If the view displays the Repository Configutarion or the Global Configuration you can open an editor dialog with the + <b>Edit</b> button (right red box in the screen shot). The editor dialog has the same functionality as the preference page <b>Team > Git > Configuration</b>. </p> <h4 id="Remote_Repositories">Remote Repositories</h4> - <p>The "Remotes" node allows for browsing and editing Remote configurations. Each Remote configuration has a name and either a Push Specification, a Fetch Specification, or both. If a "Remote Configuration" node or any of its children is selected, the + <p>The "Remotes" node allows for browsing and editing Remote configurations. Each Remote configuration has a name and either a Push Specification, a Fetch Specification, or both. If a "Remote Configuration" node or any of its children is selected, the <b>Properties</b> view will show a summary of the Remote configuration. In this example: there is a Remote configuration named "origin" which only has a Fetch Specification, but no Push Specification: </p> <p> @@ -1271,12 +1609,12 @@ Signed-off-by: William Shakespeare <will.from@the.past> </p> <p>Note that the fetch or push operation will be executed immediately in an asynchronous job; on completion you will get a confirmation pop-up displaying the fetch result.</p> <p>The "Fetch" node contains a so called fetch specification and the "Push" node contains a so called push specification.</p> - <p>A default fetch specification is created when the repository is cloned. You can edit the fetch specification with the menu entry - <b>Configure Fetch...</b>. This opens a wizard. On the first page you can edit the Fetch URI. Ob the second page you can determine the fetch ref specifications, see + <p>A default fetch specification is created when the repository is cloned. You can edit the fetch specification with the menu entry + <b>Configure Fetch...</b>. This opens a wizard. On the first page you can edit the Fetch URI. Ob the second page you can determine the fetch ref specifications, see <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specifications</a>. </p> - <p>You can create or edit a push specification with the menu entry - <b>Configure Push...</b>. This opens a wizard. On the first page you can edit the Push URIs. If a fetch is specified the fetch URI is automatically included into the push specification and no additional Push URI is needed. On the second page you can determine the push ref specifications, see + <p>You can create or edit a push specification with the menu entry + <b>Configure Push...</b>. This opens a wizard. On the first page you can edit the Push URIs. If a fetch is specified the fetch URI is automatically included into the push specification and no additional Push URI is needed. On the second page you can determine the push ref specifications, see <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specifications</a>. </p> <h5 id="Adding_a_Remote_Configuration">Adding a Remote Configuration</h5> @@ -1284,28 +1622,28 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p> <img border="0" src="images/RepoMgrNewRemote.png"/> </p> - <p>If the + <p>If the <b>Configure Fetch</b> checkbox was selected, the next wizard page will ask for the URI of the Repository to fetch from: </p> <p> <img border="0" src="images/Egit-0.9-repo-view-createRemoteWizardFetch.png"/> </p> - <p>Click + <p>Click <b>Change...</b> to open a dialog that allows you to select a URI. - The next step is to define the Remote Specification for the fetch URI. See + The next step is to define the Remote Specification for the fetch URI. See <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specifications</a> about the details. </p> - <p>If the - <b>Configure Push</b> checkbox was selected, the next wizard page will ask for the URIs of the repositories to push to. This is actually a list, as you can push to multiple repositories at once. Click - <b>Add....</b> to add URIs to the list using the same dialog as above. You can remove URIs by marking them in the list and hitting + <p>If the + <b>Configure Push</b> checkbox was selected, the next wizard page will ask for the URIs of the repositories to push to. This is actually a list, as you can push to multiple repositories at once. Click + <b>Add....</b> to add URIs to the list using the same dialog as above. You can remove URIs by marking them in the list and hitting <b>Remove</b>. - This step is completely optional if there is already a fetch URI defined. In this case, the fetch URI will also be used for push. If at least one push URI is defined in this steps, it will override the fetch URI. In this example, there is already a fetch URI, so the + This step is completely optional if there is already a fetch URI defined. In this case, the fetch URI will also be used for push. If at least one push URI is defined in this steps, it will override the fetch URI. In this example, there is already a fetch URI, so the <b>Next</b> button is enabled, even though there is no Push URI in the list: </p> <p> <img border="0" src="images/Egit-0.9-repo-view-createRemoteWizardPush.png"/> </p> - <p>The next step is to define the Remote Specification for the push URIs. See + <p>The next step is to define the Remote Specification for the push URIs. See <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specifications</a> about the details. </p> <p>Upon completion, the new Remote configuration will be visible:</p> @@ -1315,28 +1653,28 @@ Signed-off-by: William Shakespeare <will.from@the.past> <h5 id="Changing_Remote_Configurations">Changing Remote Configurations</h5> <p>It is also possible to add, remove, or change Fetch/Push Specifications for an existing Remote configuration using the context menu.</p> <h3 id="Refresh">Refresh</h3> - <p>The view is auto-refreshed periodically. The + <p>The view is auto-refreshed periodically. The <b>Refresh</b> button in the toolbar allows to trigger an immediate refresh: </p> <p> <img border="0" src="images/RepoMgrRefresh.png"/> </p> <h3 id="Link_with_Selection">Link with Selection</h3> - <p>If the + <p>If the <b>Link with selection</b> toggle is enabled, the file or folder corresponding to the current workbench selection will be displayed automatically: </p> <p> <img border="0" src="images/RepoMgrLinkWithSelection.png"/> </p> <h3 id="Link_with_Editor">Link with Editor</h3> - <p>If the + <p>If the <b>Link with editor</b> toggle is enabled, the file or folder corresponding to the currently active editor will be displayed automatically: </p> <p> <img border="0" src="images/RepoMgrLinkWithEditor.png"/> </p> <h3 id="Hierarchical_Branch_Layout">Hierarchical Branch Layout</h3> - <p>If the + <p>If the <b>Hierarchical Branch Layout</b> toggle is enabled, branches will be shown in a hierarchical layout using slash (/) as hierarchy separator: </p> <p> @@ -1349,7 +1687,10 @@ Signed-off-by: William Shakespeare <will.from@the.past> <img border="0" src="images/RepoMgrBareRepository.png"/> </p> <h3 id="Removing_Repositories_from_the_Git_Repositories_View">Removing Repositories from the Git Repositories View</h3> - <p>This is offered as a menu action on the "Repository" node. Note that this does not delete the Repository, but just removes the node from the view. If there are projects in the workspace which are located in the working directory of the Repository, the user will be prompted to confirm deletion of these projects from the Eclipse workspace.</p><hr/> + <p>This is offered as a menu action on the "Repository" node. Note that this does not delete the Repository, but just removes the node from the view. If there are projects in the workspace which are located in the working directory of the Repository, the user will be prompted to confirm deletion of these projects from the Eclipse workspace.</p> + <p> + <br/> + </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Updating-This-Document.html index 3bf9942bab..1c83fefde3 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Updating-This-Document.html @@ -28,7 +28,7 @@ <h1 id="Updating_This_Document">Updating This Document</h1> <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - + <a href="http://wiki.eclipse.org/EGit/User_Guide" target="egit_external">http://wiki.eclipse.org/EGit/User_Guide</a> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html b/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html index d7b9241eae..1dad66b227 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html @@ -27,17 +27,18 @@ </table><hr/> <h1 id="Getting_Started">Getting Started</h1> <h2 id="Overview">Overview</h2> - <p>If you're new to Git or distributed version control systems generally, then you might want to read - <a href="../../EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" title="EGit/Git For Eclipse Users">Git for Eclipse Users</a> first. If you need more details and background read the - <a href="http://book.git-scm.com" target="egit_external">Git Community Book</a> or + <p>If you're new to Git or distributed version control systems generally, then you might want to read + <a href="../../EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" title="EGit/Git For Eclipse Users">Git for Eclipse Users</a> first. If you need more details and background read the + <a href="http://book.git-scm.com" target="egit_external">Git Community Book</a> or <a href="http://progit.org/book/" target="egit_external">Git Pro</a>. </p> <h2 id="Basic_Tutorial:_Adding_a_project_to_version_control">Basic Tutorial: Adding a project to version control</h2> + <h3 id="Configuration">Configuration</h3> <ul> - <li>First you need to tell Git about yourself, click + <li>First you need to tell Git about yourself, click <b>Preferences > Team > Git > Configuration</b> </li> - <li>Click + <li>Click <b>New Entry</b> and enter the key value pairs <code>user.email</code> and <code>user.name</code> </li> <li>This information is stored in <code>~/.gitconfig</code> and will be used by Git to identify who did change the history of the repository whenever you are the user logged on to your computer.</li> @@ -48,92 +49,102 @@ <p> <img border="0" src="images/Egit-0.9-getstarted-name.png"/> </p> + <h3 id="Create_Repository">Create Repository</h3> <ul> <li>Create a new Java project <code>HelloWorld</code> </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-project.png"/> + <img border="0" src="images/Egit-0.9-getstarted-project.png"/> </p> <ul> - <li>Select the project, click - <b>File > Team > Share Project</b> + <li>Select the project, click + <b>File > Team > Share Project</b> </li> - <li>Select repository type - <b>Git</b> and click + <li>Select repository type + <b>Git</b> and click <b>Next</b> </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-share.png"/> + <img border="0" src="images/Egit-0.9-getstarted-share.png"/> </p> <ul> <li>To configure the Git repository select the new project <code>HelloWorld</code> </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-create-project.png"/> + <img border="0" src="images/Egit-0.9-getstarted-create-project.png"/> </p> <ul> - <li>Click - <b>Create</b> to initialize a new Git repository for the <code>HelloWorld</code> project. If your project already resides in the working tree of an exisiting Git repository the repository is chosen automatically. + <li>Click + <b>Create Repository</b> to initialize a new Git repository for the <code>HelloWorld</code> project. If your project already resides in the working tree of an exisiting Git repository the repository is chosen automatically. </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-project-created.png"/> + <img border="0" src="images/Egit-0.9-getstarted-project-created.png"/> </p> <ul> - <li>Click - <b>Finish</b> to close the wizard. + <li>Click + <b>Finish</b> to close the wizard. + </li> + <li>The decorator text "[master]" behind the project shows that this project is tracked in a repository on the + <i>master</i> branch and the question mark decorators show that the <code>.classpath</code> and <code>.project</code> and the <code>.settings</code> files are not yet under version control </li> - <li>The decorator text "[master]" behind the project shows that this project is tracked in a repository on the master branch and the question mark decorators show that the <code>.classpath</code> and <code>.project</code> and the <code>.settings</code> files are not yet under version control </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-shared-project.png"/> + <img border="0" src="images/Egit-0.9-getstarted-shared-project.png"/> </p> + <h3 id="Track_Changes">Track Changes</h3> <ul> - <li>Click - <b>Team > Add</b> on the project node + <li>Click + <b>Team > Add</b> on the project node + </li> + <li>The + <i>+</i> decorators show that now the project's files have been added to version control </li> - <li>The plus decorators show that now the project's files have been added to version control </li> </ul> <ul> <li>Create a file <code>.gitignore</code> in the project folder with the following content</li> </ul> - <pre>bin + <pre>bin </pre> <ul> <li>This excludes the <code>bin</code> folder from Git's list of tracked files. </li> <li>Add <code>.gitignore</code> to version control. </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-ignore-added.png"/> + <img border="0" src="images/Egit-0.9-getstarted-ignore-added.png"/> </p> <ul> - <li>Click + <li>Click <b>Team > Commit</b> in the project context menu </li> - <li>Enter a commit message explaining your change, the first line (followed by an empty line) will become the short log for this commit. By default the author and committer are taken from the .gitconfig file in your home directory. </li> - <li>You may check the checkbox "Add Signed-off-by" to add a Signed-off-by tag. </li> + <li>Enter a commit message explaining your change, the first line (followed by an empty line) will become the short log for this commit. By default the author and committer are taken from the <code>.gitconfig</code> file in your home directory. </li> + <li>You may click + <b>Add Signed-off-by</b> to add a + <i>Signed-off-by:</i> tag. + </li> <li>If you are committing the change of another author you may alter the author field to give the name and email address of the author. </li> - <li>Click - <b>Commit</b> to commit your first change. + <li>Click + <b>Commit</b> to commit your first change. </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-commit.png"/> + <img border="0" src="images/Egit-0.9-getstarted-commit.png"/> </p> <ul> <li>Note that the decorators of the committed files changed. </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-commited.png"/> + <img border="0" src="images/Egit-0.9-getstarted-commited.png"/> </p> + <h3 id="Inspect_History">Inspect History</h3> <ul> - <li>Click - <b>Show In > History</b> from the context menu to inspect the history of a resource + <li>Click + <b>Show In > History</b> from the context menu to inspect the history of a resource </li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-history1.png"/> + <img border="0" src="images/Egit-0.9-getstarted-history1.png"/> </p> <ul> <li>Create a new Java class <code>Hello.java</code> and implement it </li> @@ -142,13 +153,13 @@ <li>The resource history should now show 2 commits for this class</li> </ul> <p> - <img border="0" src="images/Egit-0.9-getstarted-application.png"/> + <img border="0" src="images/Egit-0.9-getstarted-application.png"/> </p> <p> <img border="0" src="images/Egit-0.9-getstarted-history2.png"/> </p> <ul> - <li>Click the + <li>Click the <b>Compare Mode</b> toggle button in the History View </li> <li>Double click <code>src/Hello.java</code> in the Resource History View to open your last committed change in the Compare View </li> @@ -157,12 +168,17 @@ <img border="0" src="images/Egit-0.9-getstarted-compare.png"/> </p> <p> + <br/> + <b>Congratulations, you just have mastered your first project using Git !</b> + + <br/> + <br/> </p> <h2 id="Github_Tutorial">Github Tutorial</h2> <h3 id="Create_Local_Repository">Create Local Repository</h3> <ul> - <li>follow + <li>follow <a href="http://wiki.eclipse.org/EGit/User_Guide/Getting_Started" title="EGit/User Guide/Getting Started" target="egit_external">EGit/User Guide/Getting Started</a> to create a new local repository (with your content instead of the demo project) </li> </ul> @@ -171,85 +187,102 @@ <li>create a new repository at GitHub</li> </ul> <p> - <img border="0" src="images/Egit-0.6-001-CreateRepoAtGithub.png"/> + <img border="0" src="images/Egit-0.10-github-create-repo.png"/> </p> + <p>On the next screen you can see the URLs you may use to access your fresh new repository:</p> <ul> - <li>you get a fresh clone URL for this new repository</li> + <li>click + <b>SSH</b> to choose the + <i>SSH protocol</i>. It can be used for read and write access + </li> + <li>click + <b>HTTP</b> to choose the + <i>HTTP protocol</i>. It can also be used for read and write access. + </li> + <li>click + <b>Git Read-Only</b> to choose the anonymous + <i>git protocol</i> for cloning. It's the most efficient protocol git supports. Since the + <i>git protocol</i> doesn't support authentication it's usually used to provide efficient read-only access to public repositories. + </li> </ul> <p> - <img border="0" src="images/Egit-0.6-002-CloneUrl.png"/> + <img border="0" src="images/Egit-0.10-github-cloneurl.png"/> </p> <h3 id="Eclipse_SSH_Configuration">Eclipse SSH Configuration</h3> <ul> - <li>Click - <b>Window > Preferences</b> and ensure that your SSH2 home is configured correctly (usually this is <tt>~/.ssh</tt>) and contains your SSH2 keys (upload your public key to your GitHub account settings) + <li>Open the Eclipse + <b>Preferences</b> and ensure that your SSH2 home is configured correctly (usually this is <tt>~/.ssh</tt>) and contains your SSH2 keys </li> </ul> <p> - <img border="0" src="images/Egit-0.6-003-SshPreferences.png"/> + <img border="0" src="images/Egit-0.10-ssh-preferences.png"/> </p> <ul> - <li>if you don't have SSH keys yet you may generate them on the second tab - <b>Key Management</b> of this dialog, use a good pass phrase to protect your private key, for more details see + <li>if you don't have SSH keys yet you may generate them on the second tab + <b>Key Management</b> of this dialog, use a good pass phrase to protect your private key, for more details see <a href="http://help.github.com/working-with-key-passphrases/" target="egit_external">"working with key passphrases"</a> </li> + <li>upload your public SSH key to your + <a href="https://github.com/account" target="egit_external">GitHub account settings</a> + </li> </ul> <h3 id="Push_Upstream">Push Upstream</h3> <ul> - <li>Select your new Eclipse project and click - <b>Team > Push...</b>. + <li>Click + <b>Team > Push...</b> and copy and paste the SSH URL of your new github repository + </li> + <li>If you are behind a firewall which doesn't allow SSH traffic use the github HTTPS URL instead and provide your github user and password instead of using the uploaded public SSH key. To store your credentials into the Eclipse secure store click + <b>Store in Secure Store</b>. </li> - <li>Enter - <b>Your GitHub Clone URL</b> and your GitHub password (with the free github accounts do not enter a password but leave this field blank), leave the user as <tt>git</tt>. + <li> + <b>Note:</b> many HTTP proxies are configured to block HTTP URLs containing a user name, since disclosing a user name in an HTTP URL is considered a security risk. In that case remove the username from the HTTP URL and only provide it in the user field. It will be sent as an HTTP header. </li> </ul> <p> - <img border="0" src="images/Egit-0.6-004-PushDialog.png"/> + <img border="0" src="images/Egit-0.10-github-pushurl.png"/> </p> <ul> - <li>Click + <li>Click <b>Next</b> and on first connection accept GitHub's host key. </li> </ul> - <p> - <img border="0" src="images/Egit-0.6-005-AcceptHostKey.png"/> - </p> <ul> - <li>Enter your SSH key's passphrase.</li> + <li>Enter your SSH key's passphrase and click + <b>OK</b>. + </li> </ul> - <p> - <img border="0" src="images/Egit-0.6-006-PassPhrase.png"/> - </p> <ul> - <li>Click + <li>On the next wizard page click <b>Add all branches spec</b> to map your local branch names 1:1 to the same branch names in the destination repository. </li> </ul> <p> - <img border="0" src="images/Egit-0.6-007-PushRefSpecifications.png"/> + <img border="0" src="images/Egit-0.10-github-push-refspec.png"/> </p> <ul> - <li>Click + <li>Click <b>Next</b>. The push confirmation dialog will show a preview of the changes that will be pushed to the destination repository. </li> - <li>Click - <b>Finish</b> to confirm that you want to push these changes. - </li> </ul> <p> - <img border="0" src="images/Egit-0.6-008-PushConfirmation.png"/> + <img border="0" src="images/Egit-0.10-github-push-preview.png"/> </p> <ul> + <li>Click + <b>Finish</b> to confirm that you want to push these changes. + </li> + </ul> + <ul> <li>The next dialog reports the result of the push operation.</li> </ul> <p> - <img border="0" src="images/Egit-0.6-009-PushResult.png"/> + <img border="0" src="images/Egit-0.10-github-pushresult.png"/> </p> <ul> <li>Point your browser at your GitHub repository to see that your new repository content has arrived</li> </ul> <p> - <img border="0" src="images/Egit-0.6-010-PushResultOnGithub.png"/> + <img border="0" src="images/Egit-0.10-github-pushed-repo.png"/> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Working-with-remote-Repositories.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Working-with-remote-Repositories.html deleted file mode 100644 index fd971d6013..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Working-with-remote-Repositories.html +++ /dev/null @@ -1,519 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit User Guide - Working with remote Repositories</title> - <link type="text/css" rel="stylesheet" href="../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Working with remote Repositories</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Starting-from-existing-Git-Repositories.html" title="Starting from existing Git Repositories"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Inspecting-the-state-of-the-Repository.html" title="Inspecting the state of the Repository"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Starting from existing Git Repositories</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Inspecting the state of the Repository</td> - </tr> - </table><hr/> - <h1 id="Working_with_remote_Repositories">Working with remote Repositories</h1> - <h2 id="Cloning_Remote_Repositories">Cloning Remote Repositories</h2> - <p>Using the Git Clone Wizard you may clone remote repositories using different transport protocols. </p> - <p>The wizard can be started from the "Import Projects from Git" wizard using - - <br/> - - <b>Import... > Git > Projects from Git > Next > Clone...</b> - </p> - <p>or from the "Git Repositories View" (described elsewhere) using the - <b>Clone a Git Repository</b> toolbar button. - </p> - <h3 id="Repository_Selection">Repository Selection</h3> - <p>On the first page of the wizard enter the location of the remote repository: </p> - <p> - <img border="0" src="images/02-GitProtocol.png"/> - </p> - <ul> - <li> - <b>URI</b> - The complete URI of the remote repository or the path on the file system. This field is automatically synchronized with the other fields. - <br/>Note that you can use the - <b>Local file...</b> button to browse for a local directory and that the URI field offers content assist by offering previously used values - </li> - <li> - <b>Host</b> - The name of the remote host or empty if cloning from the file system. - </li> - <li> - <b>Repository Path</b> - Path to the remote repository or on the file system. - </li> - <li> - <b>Protocol</b> - One of the protocols described below. - </li> - <li> - <b>Port</b> - Port number. - </li> - <li> - <b>User</b> - The user name used for authentication. - </li> - <li> - <b>Password</b> The password used for authentication. - </li> - </ul> - <p>The following protocols are supported: </p> - <ul> - <li> - <b>git</b> - The most efficient built-in git protocol (default port 9418). This protocol doesn't provide authentication. Typically used for anonymous read access to the repository. - </li> - <li> - <b>git+ssh</b> - Git over - <a href="http://tools.ietf.org/html/rfc4251" target="egit_external">secure shell (SSH)</a> protocol. Typically used for authenticated write access to the repository. - </li> - <li> - <b>sftp</b> - - <a href="http://en.wikipedia.org/wiki/SSH_File_Transfer_Protocol" target="egit_external">SSH File Transfer Protocol</a> - </li> - <li> - <b>http</b> - - <a href="http://tools.ietf.org/html/rfc2616" target="egit_external">Hypertext Transfer Protocol</a> can be tunneled through firewalls. - </li> - <li> - <b>https</b> - - <a href="http://tools.ietf.org/html/rfc2818" target="egit_external">Hypertext Transfer Protocol Secure</a> can be tunneled through firewalls. - </li> - <li> - <b>ftp</b> - - <a href="http://tools.ietf.org/html/rfc959" target="egit_external">File Transfer Protocol</a> - </li> - <li> - <b>file</b> - File system access to the repository. - </li> - </ul> - <h3 id="Branch_Selection">Branch Selection</h3> - <p>On the next page choose which branch should be cloned from the remote repository: </p> - <p> - <img border="0" src="images/05-branches.png"/> - </p> - <h3 id="Local_Destination">Local Destination</h3> - <p>On the next page define where you want to store the repository on the local file system and define some initial settings. </p> - <p> - <img border="0" src="images/06-LocalStorage.png"/> - </p> - <ul> - <li> - <b>Directory</b> - The directory which will contain the Git repository. It will be created by the wizard if it does not yet exist. - </li> - <li> - <b>Initial branch</b> - Choose here which local branch will be created and initially checked out. - </li> - <li> - <b>Remote name</b> - Define a name for the remote repository. The default is "origin". - </li> - </ul> - <h2 id="Git_References">Git References</h2> - <p>Git References are also known shortly as - <b>Refs</b>. - - <br/>They comprise - </p> - <ul> - <li>branches </li> - <li>remote-tracking branches </li> - <li>tags </li> - </ul> - <p>They all are named with a path using '/' as path separator and are starting with "refs". </p> - <ul> - <li>Local branches start with "refs/heads/"</li> - <li>Remote tracking branches start with "refs/remotes/"</li> - <li>Tags start with "refs/tags/"</li> - </ul> - <p>Ref names can be abbreviated as long as the abbreviated form is unique. - - <br/>E.g. - </p> - <ul> - <li>"master" is short for "refs/heads/master"</li> - <li>"origin/master" is short for "refs/remotes/origin/master"</li> - <li>"v1.0.1" is short for "refs/tags/v1.0.1"</li> - </ul> - <p>For a complete list for Ref names and the order of precedence if multiple references have the same shorthand form see the section "Specifying Revisions" section of - <a href="http://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html" target="egit_external">git rev-parse</a>. - </p> - <h2 id="Pushing_to_other_Repositories">Pushing to other Repositories</h2> - <h3 id="Direct_Push">Direct Push</h3> - <p>The easiest way for pushing is to use - <a href="Managing-Repositories.html#Direct_Fetch_and_Push_Support">Direct Push Support</a> on a Push Specification of a Remote. - </p> - <h3 id="Push_Wizard">Push Wizard</h3> - <p>The other way is using the Push Wizard - - <br/> - - <b>Team > Push...</b> - </p> - <h4 id="Push_URI">Push URI</h4> - <ul> - <li>If you already configured a Push Specification in the Repositories View you may also select it here using the drop-down list under - <b>Configured remote repositories</b>. - </li> - <li>Otherwise click - <b>Custom URI</b> and enter the URI of the upstream repository you want to push to. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-push-to-uri.png"/> - </p> - <h4 id="Push_Ref_Specifications">Push Ref Specifications</h4> - <p> - <br/> - Click - <b>Next</b> - - <br/> - Click - <b>Add all branches spec</b> - </p> - <p> - <img border="0" src="images/Egit-0.8-push-wizard.png"/> - </p> - <p>This is a convenient way to declare that you want to map your local branch names to the same branch names on the upstream repository you want to push changes to. </p> - <p>Click - <b>Add all tags spec</b> to map local tags 1:1 to tags in the repository you want to push to. - </p> - <p>If you want to map local branches to those in the upstream repository in a different way you may define more detailed mapping specifications in the following way</p> - <ul> - <li>enter source and destination ref or select already existing branches from the drop-down lists</li> - <li>click - <b>Add spec</b> - </li> - </ul> - <p>This will transfer the newly defined mapping to the list - <b>Specifications for push</b> - </p> - <p> - <b>Other common push specs:</b> - </p> - <ul> - <li>You may e.g. map <tt>refs/heads/*</tt> to <tt>refs/heads/joe/*</tt> if you want to name the branches you push to according to your nickname - <i>joe</i>. This is useful if multiple users want to publish their local branches on personal branches in a jointly used public repository. - </li> - <li>Another usual mapping is to map the source ref <tt>HEAD</tt> to the destination <tt>refs/heads/master</tt>. This means you want to map your current <tt>HEAD</tt> (which might currently point e.g. to any local topic branch) to the upstream master branch.</li> - </ul> - <h4 id="Delete_Ref_Specifications">Delete Ref Specifications</h4> - <p>To delete a ref in the destination repository select the ref to be deleted from the drop-down list - <b>Remote ref to delete</b> - and click - <b>Add spec</b>. This will create a corresponding entry in the - <b>Specifications for push</b> list. Alternatively you may type in the specification for the refs to be deleted, this may also use wildcards. Pushing Delete Ref Specifications will delete the matching Refs in the destination repository. - </p> - <p> - <img border="0" src="images/Egit-0.8-push-ref-delete.png"/> - </p> - <h4 id="Conflicting_Push_Ref_Specifications">Conflicting Push Ref Specifications</h4> - <p>If you add multiple conflicting Push Ref Specifications they will be marked in red, solve this by removing or editing the conflicting specs. It is also possible to edit the specs in-place in the list - <b>Specifications for push</b> - </p> - <p> - <img border="0" src="images/Egit-0.8-push-conflicting-specs.png"/> - </p> - <h4 id="Push_Confirmation">Push Confirmation</h4> - <p>Click - <b>Next</b> - </p> - <p>This will open the Push Confirmation dialog showing a preview which changes will be pushed to the destination repository. - If this does not match your expectation click - <b>Back</b> and correct your push specs accordingly. - </p> - <ul> - <li>For ref updates the range of commits to be pushed will be shown in the format <tt> - <b><SHA1-from>..<SHA1-to></b></tt> e.g. <tt> - <b>d97f5a2e..adfdbfd2</b></tt> means all commits between <tt> - <b>d97f5a2e</b></tt> and <tt> - <b>adfdbfd2</b></tt> will be pushed. - </li> - <li>For refs which do not yet exist in the destination repository <tt> - <b>[new branch]</b></tt> or <tt> - <b>[new tag]</b></tt> is displayed. - </li> - <li>For refs which will be delete <tt> - <b>[deleted]</b></tt> is shown. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-push-confirmation.png"/> - </p> - <ul> - <li>Select the - <b>Push only if remote refs don't change in the mean time</b> check box if you want to be sure that what you see in this preview is also what you get when pushing these changes out. - </li> - <li>Select the - <b>Show final report dialog only when it differs from this confirmation report</b> check box if you only want to get a report after executing the push if the result differs from this preview. - </li> - </ul> - <h4 id="Push_Result_Report">Push Result Report</h4> - <p>Click - <b>Finish</b> - </p> - <p>Depending on the options you have chosen a push result report dialog is shown</p> - <p> - <img border="0" src="images/Egit-0.8-push-result.png"/> - </p> - <p>Click - <b>Ok</b> to close the dialog. - </p> - <h3 id="Example:_Pushing_a_Local_Repository_to_GitHub">Example: Pushing a Local Repository to GitHub</h3> - <h4 id="Create_Local_Repository">Create Local Repository</h4> - <ul> - <li>follow - <a href="http://wiki.eclipse.org/EGit/User_Guide/Getting_Started" title="EGit/User Guide/Getting Started" target="egit_external">EGit/User Guide/Getting Started</a> to create a new local repository (with your content instead of the demo project) - </li> - </ul> - <h4 id="Create_Repository_at_GitHub">Create Repository at GitHub</h4> - <ul> - <li>create a new repository at GitHub</li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-001-CreateRepoAtGithub.png"/> - </p> - <ul> - <li>you get a fresh clone URL for this new repository</li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-002-CloneUrl.png"/> - </p> - <h4 id="Eclipse_SSH_Configuration">Eclipse SSH Configuration</h4> - <ul> - <li>Click - <b>Window > Preferences</b> and ensure that your SSH2 home is configured correctly (usually this is <tt>~/.ssh</tt>) and contains your SSH2 keys (upload your public key to your GitHub account settings) - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-003-SshPreferences.png"/> - </p> - <ul> - <li>if you don't have SSH keys yet you may generate them on the second tab - <b>Key Management</b> of this dialog, use a good pass phrase to protect your private key, for more details see - <a href="http://help.github.com/working-with-key-passphrases/" target="egit_external">"working with key passphrases"</a> - </li> - </ul> - <h4 id="Push_Upstream">Push Upstream</h4> - <ul> - <li>Select your new Eclipse project and click - <b>Team > Push...</b>. - </li> - <li>Enter - <b>Your GitHub Clone URL</b> and your GitHub password (with the free github accounts do not enter a password but leave this field blank), leave the user as <tt>git</tt>. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-004-PushDialog.png"/> - </p> - <ul> - <li>Click - <b>Next</b> and on first connection accept GitHub's host key. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-005-AcceptHostKey.png"/> - </p> - <ul> - <li>Enter your SSH key's passphrase.</li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-006-PassPhrase.png"/> - </p> - <ul> - <li>Click - <b>Add all branches spec</b> to map your local branch names 1:1 to the same branch names in the destination repository. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-007-PushRefSpecifications.png"/> - </p> - <ul> - <li>Click - <b>Next</b>. The push confirmation dialog will show a preview of the changes that will be pushed to the destination repository. - </li> - <li>Click - <b>Finish</b> to confirm that you want to push these changes. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-008-PushConfirmation.png"/> - </p> - <ul> - <li>The next dialog reports the result of the push operation.</li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-009-PushResult.png"/> - </p> - <ul> - <li>Point your browser at your GitHub repository to see that your new repository content has arrived</li> - </ul> - <p> - <img border="0" src="images/Egit-0.6-010-PushResultOnGithub.png"/> - </p> - <h2 id="Fetching_from_other_Repositories">Fetching from other Repositories</h2> - <h3 id="Direct_Fetch">Direct Fetch</h3> - <p>The easiest way for fetching is to use - <a href="Managing-Repositories.html#Direct_Fetch_and_Push_Support">Direct Fetch Support</a> on a Fetch Specification of a Remote. - </p> - <h3 id="Fetch_Wizard">Fetch Wizard</h3> - <p>The other way is using the Fetch Wizard - - <br/> - - <b>Team > Fetch...</b> - </p> - <ul> - <li>If you already configured a Fetch Specification in the Repositories View you may also select it here using the drop-down list under - <b>Configured remote repositories</b>. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-fetch-from-fetch-spec.png"/> - </p> - <ul> - <li>Otherwise click - <b>Custom URI</b> and enter the URI of the upstream repository you want to fetch changes from. - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.8-fetch-from-uri.png"/> - </p> - <h4 id="Fetch_Ref_Specifications">Fetch Ref Specifications</h4> - <p>Click - <b>Next</b> - - <br/> - Click - <b>Add all branches spec</b> - </p> - <p> - <img border="0" src="images/Egit-0.8-fetch-spec.png"/> - </p> - <p>This is a convenient way to declare that you want to map the branch names in the upstream repository you want to fetch changes from 1:1 to the same local branch names. </p> - <ul> - <li>Click in the edit field - <b>Destination Ref</b> and replace the path segment - <i>choose_remote_name</i> with a symbolic name for the upstream repository you are going to fetch from. - </li> - <li>The default remote name for the repository your repository has been cloned from is <tt> - <b>origin</b></tt>. The master of this remote maps by default from <tt> - <b>refs/heads/master</b></tt> to <tt> - <b>refs/remotes/origin/master</b></tt>. - </li> - <li>If you e.g. want to additionally track branches from Joe's repository in your local repository you would map the branch in his repository <tt> - <b>refs/heads/*</b></tt> to the following tracking branches <tt> - <b>refs/remotes/joe/*</b></tt>. - </li> - <li>Deselect - <b>Force Update</b> if you want to allow fast-forward updates only, select this option if you also want to allow non-fast-forward changes. - </li> - <li>Click - <b>Force Update all Refs</b> to set the force update option on all specs - </li> - <li>Click - <b>Remove all specs</b> to remove all specs from the list - <b>Specifications for fetch</b> - </li> - </ul> - <ul> - <li>Click - <b>Add all tags spec</b> to map tags tags in the repository you want to fetch from 1:1 to local tags. - </li> - </ul> - <p>If you want to map branches or tags in the upstream repository to local branches in a different way you may define more detailed mapping specifications in the following way</p> - <ul> - <li>enter source (ref in source repository) and destination ref (tracking branch or tag in local repository) or select already existing branches from the drop-down lists</li> - <li>click - <b>Add spec</b> - </li> - </ul> - <p>This will transfer the newly defined mapping to the list - <b>Specifications for fetch</b> - </p> - <h4 id="Fetch_Result_Report">Fetch Result Report</h4> - <p>Click - <b>Finish</b> - </p> - <p> - <img border="0" src="images/Egit-0.8-fetch-result.png"/> - </p> - <p>A fetch result dialog is shown.</p> - <ul> - <li>For ref updates the range of commits which have been fetched will be shown in the format <tt> - <b><SHA1-from>..<SHA1-to></b></tt> e.g. <tt> - <b>d97f5a2e..adfdbfd2</b></tt> means all commits between <tt> - <b>d97f5a2e</b></tt> and <tt> - <b>adfdbfd2</b></tt> have been fetched. - </li> - <li>For refs which didn't exist before in the local repository <tt> - <b>[new branch]</b></tt> or <tt> - <b>[new tag]</b></tt> is displayed. - </li> - <li>For refs which have been deleted <tt> - <b>[deleted]</b></tt> is shown. - </li> - </ul> - <h2 id="Pulling_New_Changes_from_Upstream_Repositories">Pulling New Changes from Upstream Repositories</h2> - <p>This is not yet fully available. </p> - <p>In cases where fast-forward merges are sufficient (full merge is not yet implemented) you may run pull in EGit in the following way:</p> - <ul> - <li> - <a href="Working-with-remote-Repositories.html#Fetching_from_other_Repositories">Fetch changes</a> from upstream repository - </li> - <li> - <a href="Managing-Repositories.html#Check-out_of_Branches_and_Tags">Checkout the branch</a> you want to pull the upstream changes into - </li> - <li> - <a href="Merging.html#Merging_a_branch_or_a_tag_into_the_current_branch">Merge</a> the branch or tag you want to integrate into your current branch - </li> - </ul> - <p>Available alternatives currently include: </p> - <ul> - <li>run - <b>git pull</b> from outside eclipse (but - <a href="http://marc.info/?l=git&m=123924844219075" target="egit_external">beware on Windows</a>) - </li> - <li>if you did no local change or want to discard your local changes, use - <b>Team > Reset...</b> - </li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Starting-from-existing-Git-Repositories.html" title="Starting from existing Git Repositories"> - <img alt="Previous" border="0" src="../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="User-Guide.html" title="EGit User Guide"> - <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Inspecting-the-state-of-the-Repository.html" title="Inspecting the state of the Repository"> - <img alt="Next" border="0" src="../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Starting from existing Git Repositories</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Inspecting the state of the Repository</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-CreateNewJavaProject.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-CreateNewJavaProject.png Binary files differdeleted file mode 100644 index d9865de523..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-CreateNewJavaProject.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-TextDecorations.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-TextDecorations.png Binary files differindex 5896590d2f..262fdd991c 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-TextDecorations.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-TextDecorations.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-GitProtocol.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-GitProtocol.png Binary files differdeleted file mode 100644 index 373b5ebdb9..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-GitProtocol.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-IconDecorations.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-IconDecorations.png Binary files differindex c15feb4b1d..5f331621e5 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-IconDecorations.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-IconDecorations.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-TeamShareProject.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-TeamShareProject.png Binary files differdeleted file mode 100644 index cf0851f7fc..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-TeamShareProject.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-CompareWith.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-CompareWith.png Binary files differindex 37b0bc966d..24266ebe6d 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-CompareWith.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-CompareWith.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-ExampleDecoration.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-ExampleDecoration.png Binary files differindex eabc67928d..591a7bb87e 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-ExampleDecoration.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-ExampleDecoration.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-SelectRepositoryTypeGit.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-SelectRepositoryTypeGit.png Binary files differdeleted file mode 100644 index 7c6e5cb740..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-SelectRepositoryTypeGit.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-QuickDiffPreferences.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-QuickDiffPreferences.png Binary files differindex 524ac40dd1..96176ee2dc 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-QuickDiffPreferences.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-QuickDiffPreferences.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-SelectProjectToConfigureGitRepository.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-SelectProjectToConfigureGitRepository.png Binary files differdeleted file mode 100644 index cb254aadaf..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-SelectProjectToConfigureGitRepository.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-CreateNewGitRepository.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-CreateNewGitRepository.png Binary files differdeleted file mode 100644 index e08fe1d4e1..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-CreateNewGitRepository.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-QuickDiffInEditor.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-QuickDiffInEditor.png Binary files differindex 55ef3026d1..745a11da5d 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-QuickDiffInEditor.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-QuickDiffInEditor.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-branches.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-branches.png Binary files differdeleted file mode 100644 index 15478b7e7f..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-branches.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-LocalStorage.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-LocalStorage.png Binary files differdeleted file mode 100644 index e682f908d5..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-LocalStorage.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-NewGitRepository.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-NewGitRepository.png Binary files differdeleted file mode 100644 index 954bb3ba1f..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-NewGitRepository.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-QuickDiffInEditorPopup.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-QuickDiffInEditorPopup.png Binary files differindex e1b4baa011..c71ab5d360 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-QuickDiffInEditorPopup.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-QuickDiffInEditorPopup.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/07-AddToVersionControl.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/07-AddToVersionControl.png Binary files differdeleted file mode 100644 index c1ff648c0b..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/07-AddToVersionControl.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/08-AddedToVersionControl.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/08-AddedToVersionControl.png Binary files differdeleted file mode 100644 index 10099d9dba..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/08-AddedToVersionControl.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/09-IgnoredResources.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/09-IgnoredResources.png Binary files differdeleted file mode 100644 index 11a5fb6138..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/09-IgnoredResources.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/10-ClickCommit.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/10-ClickCommit.png Binary files differdeleted file mode 100644 index 8ae430c964..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/10-ClickCommit.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/11-CommitDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/11-CommitDialog.png Binary files differdeleted file mode 100644 index fe4788cf15..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/11-CommitDialog.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/12-CommittedFiles.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/12-CommittedFiles.png Binary files differdeleted file mode 100644 index f6a4f1185d..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/12-CommittedFiles.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/13-SelectResourceHistory.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/13-SelectResourceHistory.png Binary files differdeleted file mode 100644 index be55d75869..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/13-SelectResourceHistory.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/14-ResourceHistory.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/14-ResourceHistory.png Binary files differdeleted file mode 100644 index 20dcce7905..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/14-ResourceHistory.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/15-FirstImplementation.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/15-FirstImplementation.png Binary files differdeleted file mode 100644 index cc81f599f2..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/15-FirstImplementation.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/16-ShowChange.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/16-ShowChange.png Binary files differdeleted file mode 100644 index 1bd30f2ff5..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/16-ShowChange.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick1.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick1.png Binary files differnew file mode 100644 index 0000000000..0c25e444fe --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick1.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick2.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick2.png Binary files differnew file mode 100644 index 0000000000..0f8ab37277 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick2.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick3.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick3.png Binary files differnew file mode 100644 index 0000000000..ea181c8330 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick3.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Conflicts.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Conflicts.png Binary files differindex f74611c9aa..8629d1ca9a 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Conflicts.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Conflicts.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CreateBranch.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CreateBranch.png Binary files differindex 949e2876fb..b55f1298fd 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CreateBranch.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CreateBranch.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-MergeDemoHistory.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-MergeDemoHistory.png Binary files differnew file mode 100644 index 0000000000..9047508374 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-MergeDemoHistory.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-MergeDemoHistoryAfterRebase.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-MergeDemoHistoryAfterRebase.png Binary files differnew file mode 100644 index 0000000000..61ef292fb2 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-MergeDemoHistoryAfterRebase.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-RebaseConflictDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-RebaseConflictDialog.png Binary files differnew file mode 100644 index 0000000000..410497b659 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-RebaseConflictDialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-StartRebaseFromRepoView.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-StartRebaseFromRepoView.png Binary files differnew file mode 100644 index 0000000000..fd4b9b6449 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-StartRebaseFromRepoView.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.7-ViewDiffInResourceHistory.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.7-ViewDiffInResourceHistory.png Binary files differindex 5dd4afb1b3..4b4d60d8f0 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.7-ViewDiffInResourceHistory.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.7-ViewDiffInResourceHistory.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AddFile.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AddFile.png Binary files differdeleted file mode 100644 index a52ace5bd9..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AddFile.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AddedAndModifiedFiles.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AddedAndModifiedFiles.png Binary files differdeleted file mode 100644 index 4749e5b32c..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AddedAndModifiedFiles.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AmendBringsOldCommitMessage.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AmendBringsOldCommitMessage.png Binary files differdeleted file mode 100644 index fc1d510420..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-AmendBringsOldCommitMessage.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Commit.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Commit.png Binary files differdeleted file mode 100644 index a1c067797d..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Commit.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-CommitDialog2.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-CommitDialog2.png Binary files differdeleted file mode 100644 index 1be734352a..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-CommitDialog2.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Corrected.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Corrected.png Binary files differindex bd6e584f61..df9f52b45f 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Corrected.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Corrected.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Typo.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Typo.png Binary files differindex f744104929..cdb17ff4f3 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Typo.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-Typo.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.0-create-patch-dialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.0-create-patch-dialog.png Binary files differindex 63f55769ce..4121e1b0ef 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.0-create-patch-dialog.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.0-create-patch-dialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.0-create-patch-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.0-create-patch-menu.png Binary files differindex 520d3eddfa..fbb05c4484 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.0-create-patch-menu.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.0-create-patch-menu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmProjectRemoval.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmProjectRemoval.png Binary files differnew file mode 100644 index 0000000000..c898a6f0dd --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmProjectRemoval.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmRepositoryDeletion.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmRepositoryDeletion.png Binary files differnew file mode 100644 index 0000000000..65127d3fe9 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmRepositoryDeletion.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-DeleteRepository.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-DeleteRepository.png Binary files differnew file mode 100644 index 0000000000..6ede45c9cc --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-DeleteRepository.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-RemoveRepository.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-RemoveRepository.png Binary files differnew file mode 100644 index 0000000000..6df21b7da4 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-RemoveRepository.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-cloneurl.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-cloneurl.png Binary files differnew file mode 100644 index 0000000000..0c9b610503 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-cloneurl.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-create-repo.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-create-repo.png Binary files differnew file mode 100644 index 0000000000..aecff6dc3d --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-create-repo.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-push-preview.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-push-preview.png Binary files differnew file mode 100644 index 0000000000..03d7b83d03 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-push-preview.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-push-refspec.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-push-refspec.png Binary files differnew file mode 100644 index 0000000000..553a7d9f6c --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-push-refspec.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushed-repo.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushed-repo.png Binary files differnew file mode 100644 index 0000000000..c7b21065f2 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushed-repo.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushresult.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushresult.png Binary files differnew file mode 100644 index 0000000000..3012a71563 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushresult.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushurl.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushurl.png Binary files differnew file mode 100644 index 0000000000..cec385b328 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-github-pushurl.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-history-commitmenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-history-commitmenu.png Binary files differnew file mode 100644 index 0000000000..9bc97cc216 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-history-commitmenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-merge-conflict.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-merge-conflict.png Binary files differnew file mode 100644 index 0000000000..213e29f452 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-merge-conflict.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-merge-tool.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-merge-tool.png Binary files differnew file mode 100644 index 0000000000..c2ec281716 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-merge-tool.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-project-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-project-menu.png Binary files differnew file mode 100644 index 0000000000..e605f25b50 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-project-menu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-branchmenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-branchmenu.png Binary files differnew file mode 100644 index 0000000000..53a4c8b259 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-branchmenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-fetchmenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-fetchmenu.png Binary files differnew file mode 100644 index 0000000000..d3bf685c80 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-fetchmenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-pushmenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-pushmenu.png Binary files differnew file mode 100644 index 0000000000..53c8b61bf8 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-pushmenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-refmenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-refmenu.png Binary files differnew file mode 100644 index 0000000000..fb639d5c38 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-refmenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-repomenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-repomenu.png Binary files differnew file mode 100644 index 0000000000..16bb78a132 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-repomenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-tagmenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-tagmenu.png Binary files differnew file mode 100644 index 0000000000..df870094d6 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-tagmenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-worktreemenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-worktreemenu.png Binary files differnew file mode 100644 index 0000000000..37f847224e --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-worktreemenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview.png Binary files differnew file mode 100644 index 0000000000..54e20c3496 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-resource-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-resource-menu.png Binary files differnew file mode 100644 index 0000000000..160640983d --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-resource-menu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-select-merge-mode.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-select-merge-mode.png Binary files differnew file mode 100644 index 0000000000..d020ad6ea8 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-select-merge-mode.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ssh-preferences.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ssh-preferences.png Binary files differnew file mode 100644 index 0000000000..94e0612f0e --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ssh-preferences.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-001-CreateRepoAtGithub.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-001-CreateRepoAtGithub.png Binary files differdeleted file mode 100644 index baafa6b0c3..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-001-CreateRepoAtGithub.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-002-CloneUrl.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-002-CloneUrl.png Binary files differdeleted file mode 100644 index a1cdd18d2f..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-002-CloneUrl.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-003-SshPreferences.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-003-SshPreferences.png Binary files differdeleted file mode 100644 index 4c86bb75a3..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-003-SshPreferences.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-004-PushDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-004-PushDialog.png Binary files differdeleted file mode 100644 index f9d28a3d2d..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-004-PushDialog.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-005-AcceptHostKey.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-005-AcceptHostKey.png Binary files differdeleted file mode 100644 index f07b33a87b..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-005-AcceptHostKey.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-006-PassPhrase.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-006-PassPhrase.png Binary files differdeleted file mode 100644 index 4a28efd9eb..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-006-PassPhrase.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-007-PushRefSpecifications.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-007-PushRefSpecifications.png Binary files differdeleted file mode 100644 index 207ea0f030..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-007-PushRefSpecifications.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-008-PushConfirmation.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-008-PushConfirmation.png Binary files differdeleted file mode 100644 index 20acf4cad7..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-008-PushConfirmation.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-009-PushResult.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-009-PushResult.png Binary files differdeleted file mode 100644 index e8dcc666e7..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-009-PushResult.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-010-PushResultOnGithub.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-010-PushResultOnGithub.png Binary files differdeleted file mode 100644 index 88a0ac5114..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.6-010-PushResultOnGithub.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-branch-dialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-branch-dialog.png Binary files differindex 9d323f3c1a..b0581a272a 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-branch-dialog.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-branch-dialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-project.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-project.png Binary files differdeleted file mode 100644 index 05f07fb649..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-project.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-resource.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-resource.png Binary files differdeleted file mode 100644 index 6957cd51a0..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-resource.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-fetch-spec.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-fetch-spec.png Binary files differdeleted file mode 100644 index e6d065da26..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-fetch-spec.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-uri.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-uri.png Binary files differdeleted file mode 100644 index ea70cbd5e3..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-uri.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-result.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-result.png Binary files differdeleted file mode 100644 index e07a5baa63..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-result.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-spec.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-spec.png Binary files differdeleted file mode 100644 index f698c1dab2..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-spec.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-branches.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-branches.png Binary files differdeleted file mode 100644 index aa3f21f3b5..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-branches.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-configuration.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-configuration.png Binary files differdeleted file mode 100644 index 9f9ab972f2..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-configuration.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-search.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-search.png Binary files differdeleted file mode 100644 index 4869923e3b..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-search.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-tag.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-tag.png Binary files differdeleted file mode 100644 index 083a72b996..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-tag.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-folder.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-folder.png Binary files differdeleted file mode 100644 index 75a7df58de..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-folder.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-magnifier.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-magnifier.png Binary files differdeleted file mode 100644 index 42e015f843..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-magnifier.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-none.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-none.png Binary files differdeleted file mode 100644 index 4bfa40fa8e..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-none.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-project.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-project.png Binary files differdeleted file mode 100644 index 4cbfd1d44e..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-project.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-repository.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-repository.png Binary files differdeleted file mode 100644 index 558120618a..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view-toggle-repository.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view.png Binary files differdeleted file mode 100644 index d4c8ee8a94..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-history-view.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-confirmation.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-confirmation.png Binary files differdeleted file mode 100644 index db83a2918b..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-confirmation.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-conflicting-specs.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-conflicting-specs.png Binary files differdeleted file mode 100644 index 9ce6247093..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-conflicting-specs.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-ref-delete.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-ref-delete.png Binary files differdeleted file mode 100644 index 2b20c7ccdb..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-ref-delete.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-result.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-result.png Binary files differdeleted file mode 100644 index 790cfd5ff0..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-result.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-to-uri.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-to-uri.png Binary files differdeleted file mode 100644 index a42d6c4adc..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-to-uri.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-wizard.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-wizard.png Binary files differdeleted file mode 100644 index 566ec2ecb4..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-wizard.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-create.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-create.png Binary files differindex 8f8823fe8b..88cf90043a 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-create.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-create.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-replace.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-replace.png Binary files differindex 2de74b3590..83933e0a8c 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-replace.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-replace.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-branch-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-branch-page.png Binary files differindex 5184eada5a..c3ebb170f5 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-branch-page.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-branch-page.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-destination-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-destination-page.png Binary files differindex a9fc797692..a47b0a9913 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-destination-page.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-destination-page.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-url-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-url-page.png Binary files differindex 2602b01c1e..d087744172 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-url-page.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-url-page.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-amend.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-amend.png Binary files differindex 23fb636eec..0516c56091 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-amend.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-amend.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-spell-quickfix.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-spell-quickfix.png Binary files differindex af7f5f4a6f..c748630fd1 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-spell-quickfix.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-spell-quickfix.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog.png Binary files differindex ad290bb7f9..46726a8a5f 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-refspec.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-refspec.png Binary files differindex d90e4ddc00..c052704806 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-refspec.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-refspec.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-result.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-result.png Binary files differindex 148ef7d5da..d943adbeb8 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-result.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-result.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-source-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-source-page.png Binary files differindex 519464863e..6a8c93dd4d 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-source-page.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-source-page.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-source-url-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-source-url-page.png Binary files differindex d783b9f458..1ffac781c9 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-source-url-page.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-source-url-page.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-application.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-application.png Binary files differindex ddac4cdb67..417531aaa2 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-application.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-application.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-commit.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-commit.png Binary files differindex 2ce78edc0a..a83b8bdda8 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-commit.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-commit.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-commited.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-commited.png Binary files differindex 21f8231c1c..1245328a7a 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-commited.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-commited.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-compare.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-compare.png Binary files differindex 7a05a5d030..bf70fb2e7d 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-compare.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-compare.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.png Binary files differindex 0e0975706e..f2d07524e4 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-email.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-email.png Binary files differindex b6a8320545..783da5c539 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-email.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-email.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history1.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history1.png Binary files differindex 128576b935..99d06c7f04 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history1.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history1.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history2.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history2.png Binary files differindex d00bed2d88..f24c231ac2 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history2.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history2.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-ignore-added.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-ignore-added.png Binary files differindex e77cc8af66..d89ff3e048 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-ignore-added.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-ignore-added.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-name.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-name.png Binary files differindex 08d6759c7c..7e75644f12 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-name.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-name.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.png Binary files differindex ac4fe5adba..5b636d8b92 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project.png Binary files differindex 0727c06c5f..50b323b829 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.png Binary files differindex cc5d09bdc1..b07ad94728 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-shared-project.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-shared-project.png Binary files differindex 6d27c44100..f40f9fa56f 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-shared-project.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-shared-project.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-allbranches.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-allbranches.png Binary files differindex 93fbd72c91..30e209f164 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-allbranches.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-allbranches.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-allbranchesToggle.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-allbranchesToggle.png Binary files differindex e4e23b5834..186e41906a 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-allbranchesToggle.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-allbranchesToggle.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-branchAndMerge.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-branchAndMerge.png Binary files differindex b4a71e5d75..ad2129622e 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-branchAndMerge.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-branchAndMerge.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-comparemode.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-comparemode.png Binary files differindex 347de1f79d..8fc002fe67 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-comparemode.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-comparemode.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-config.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-config.png Binary files differindex 27901dd63c..a5dbb8006d 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-config.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-config.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.png Binary files differindex e08a5a33ab..a4b5d20e42 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.png Binary files differindex f94f1d250e..87866cafe0 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.png Binary files differindex e8561b830b..aad2ca23a0 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-filtersettings.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-filtersettings.png Binary files differindex 93d648a91c..47af4ed4c7 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-filtersettings.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-filtersettings.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-openAndCompare.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-openAndCompare.png Binary files differindex 8660c51fec..19ef117da3 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-openAndCompare.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-openAndCompare.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-openAndCompareFromDetails.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-openAndCompareFromDetails.png Binary files differindex 2235ad0f56..fd0b628809 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-openAndCompareFromDetails.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-openAndCompareFromDetails.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-search.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-search.png Binary files differindex 479fc78be4..30503890d9 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-search.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-search.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-viewmenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-viewmenu.png Binary files differindex bf69462f28..d1f54a0c21 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-viewmenu.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-viewmenu.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view.png Binary files differindex 4ef4b04c19..5aa5ec9fa9 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-add-dialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-add-dialog.png Binary files differindex fe85206832..b99041e3b7 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-add-dialog.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-add-dialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-filled-list.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-filled-list.png Binary files differindex 6dec1eceb9..ef26250987 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-filled-list.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-filled-list.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-general-project.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-general-project.png Binary files differindex 4bc957c617..5254a354e3 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-general-project.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-general-project.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-projects.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-projects.png Binary files differindex 64c33fb66e..0128d77859 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-projects.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-projects.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-repository.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-repository.png Binary files differindex 51e15f44c4..9c3f25ed09 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-repository.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-repository.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-wizard.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-wizard.png Binary files differindex 4675df61f1..fbc0cdc557 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-wizard.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-wizard.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-share-manually.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-share-manually.png Binary files differindex e2df43a77e..a43ad69798 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-share-manually.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-share-manually.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-label-decorators.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-label-decorators.png Binary files differindex ed82c04db7..24230451a7 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-label-decorators.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-label-decorators.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-lifecycle-file.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-lifecycle-file.png Binary files differindex b6651e24ff..c1978700c6 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-lifecycle-file.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-lifecycle-file.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-project-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-project-menu.png Binary files differdeleted file mode 100644 index 472f529b2e..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-project-menu.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-accept-hostkey.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-accept-hostkey.png Binary files differindex ff2fd3bacd..9205bf4326 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-accept-hostkey.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-accept-hostkey.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-confirm-push.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-confirm-push.png Binary files differindex 5f40208e7e..09abbcf942 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-confirm-push.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-confirm-push.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-delete-refspec.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-delete-refspec.png Binary files differindex 750b4f7861..cab8da0429 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-delete-refspec.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-delete-refspec.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-destination-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-destination-page.png Binary files differindex 3f9a3de9a1..8ec921495b 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-destination-page.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-destination-page.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-push-result.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-push-result.png Binary files differindex 9ef92ea7b9..dc0ae527f9 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-push-result.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-push-result.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-refspec-allbranches.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-refspec-allbranches.png Binary files differindex e8790f6c9e..964f1b10f7 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-refspec-allbranches.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-refspec-allbranches.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-refspec-conflict.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-refspec-conflict.png Binary files differindex f85982a664..158092dc08 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-refspec-conflict.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-refspec-conflict.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-ssh-passphrase.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-ssh-passphrase.png Binary files differindex dd739b51ed..b5189a6fcb 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-ssh-passphrase.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-ssh-passphrase.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-repo-view-createRemoteWizardFetch.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-repo-view-createRemoteWizardFetch.png Binary files differindex f8fa9f1a20..b4aaff4b5c 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-repo-view-createRemoteWizardFetch.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-repo-view-createRemoteWizardFetch.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-repo-view-createRemoteWizardPush.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-repo-view-createRemoteWizardPush.png Binary files differindex ed66e6dd9f..f1f9e24c66 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-repo-view-createRemoteWizardPush.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-repo-view-createRemoteWizardPush.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-resource-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-resource-menu.png Binary files differdeleted file mode 100644 index 52cacbca75..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-resource-menu.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-add.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-add.png Binary files differindex 5c52e6108e..3983374890 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-add.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-add.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-delete.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-delete.png Binary files differindex 33ad963ced..45002263a8 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-delete.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-delete.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-modify.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-modify.png Binary files differindex 0a188e1e30..66f459a967 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-modify.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-conflict-modify.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-add.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-add.png Binary files differindex e47261e094..ba6609c34e 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-add.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-add.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-change.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-change.png Binary files differindex 92efac1d19..0324d74fce 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-change.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-change.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-deletion.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-deletion.png Binary files differindex dc97c90eed..9e043b4c59 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-deletion.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-incoming-deletion.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-mode.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-mode.png Binary files differindex 62be223977..54db09f2ec 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-mode.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-mode.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-navigation.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-navigation.png Binary files differindex 52eea6be39..503353bb32 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-navigation.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-navigation.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-add.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-add.png Binary files differindex 8cd5d8f95c..1b575365e4 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-add.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-add.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-change.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-change.png Binary files differindex 1a0511bb45..8be513100f 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-change.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-change.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-delete.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-delete.png Binary files differindex 82920528da..a1ebc840c1 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-delete.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-outgoing-delete.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-overview-labels.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-overview-labels.png Binary files differindex 733df2bda3..77f68f8b72 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-overview-labels.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-overview-labels.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-overview.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-overview.png Binary files differindex 06d2080168..df3f40c6ca 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-overview.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-synchronize-overview.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectAddDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectAddDialog.png Binary files differdeleted file mode 100644 index aad229573d..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectAddDialog.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectEmptyList.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectEmptyList.png Binary files differdeleted file mode 100644 index b24f4d91fd..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectEmptyList.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectFilledList.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectFilledList.png Binary files differdeleted file mode 100644 index 789ea4af94..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectFilledList.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectNewGeneralProject.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectNewGeneralProject.png Binary files differdeleted file mode 100644 index e3d0b42356..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectNewGeneralProject.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectProjectList.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectProjectList.png Binary files differdeleted file mode 100644 index 6610212cf1..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectProjectList.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectSelectWizard.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectSelectWizard.png Binary files differdeleted file mode 100644 index 36af1d2045..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectSelectWizard.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectShareProject.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectShareProject.png Binary files differdeleted file mode 100644 index f071e67e88..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectShareProject.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectWizard.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectWizard.png Binary files differdeleted file mode 100644 index 4d20e988e8..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ImportProjectWizard.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeDialog.png Binary files differindex 317d9d8cf2..b66d84be77 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeDialog.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeDialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeResultMerged.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeResultMerged.png Binary files differindex 2b01c8d117..cc9262f88a 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeResultMerged.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeResultMerged.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/PatchContextMenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/PatchContextMenu.png Binary files differdeleted file mode 100644 index 91fcfe70fd..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/PatchContextMenu.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/PatchWizardPage1.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/PatchWizardPage1.png Binary files differdeleted file mode 100644 index bf699fe744..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/PatchWizardPage1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ReplaceWithGitIndex.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ReplaceWithGitIndex.png Binary files differdeleted file mode 100644 index d776809643..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ReplaceWithGitIndex.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrAddRepositoryIcon.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrAddRepositoryIcon.png Binary files differindex 7302d8c22b..0c7e14fba6 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrAddRepositoryIcon.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrAddRepositoryIcon.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrBareRepository.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrBareRepository.png Binary files differindex e78a85435e..24a5f54486 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrBareRepository.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrBareRepository.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrBranchesAndTags.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrBranchesAndTags.png Binary files differindex 7fdeea2f46..1517fcffde 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrBranchesAndTags.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrBranchesAndTags.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCheckedOutBranch.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCheckedOutBranch.png Binary files differindex 31fca4119e..e36fa501c9 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCheckedOutBranch.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCheckedOutBranch.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCloneRepositoryIcon.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCloneRepositoryIcon.png Binary files differindex 08001ffd4c..5f36305e60 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCloneRepositoryIcon.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCloneRepositoryIcon.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateBranch.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateBranch.png Binary files differindex 6e78505184..6ddbdaab78 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateBranch.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateBranch.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateRepositoryDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateRepositoryDialog.png Binary files differindex dcf986b4de..5cab7a8497 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateRepositoryDialog.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateRepositoryDialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateRepositoryIcon.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateRepositoryIcon.png Binary files differindex 9ed75e55ab..be911dca9a 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateRepositoryIcon.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateRepositoryIcon.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrHierarchicalBranchLayout.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrHierarchicalBranchLayout.png Binary files differindex a8d92197bd..7110f969dd 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrHierarchicalBranchLayout.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrHierarchicalBranchLayout.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrImportNodes.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrImportNodes.png Binary files differindex 842466fa30..0390188e5e 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrImportNodes.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrImportNodes.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrLinkWithEditor.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrLinkWithEditor.png Binary files differindex f816da4ec3..a49c672b79 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrLinkWithEditor.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrLinkWithEditor.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrLinkWithSelection.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrLinkWithSelection.png Binary files differindex 2c306fd373..4f9434add8 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrLinkWithSelection.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrLinkWithSelection.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrNewRemote.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrNewRemote.png Binary files differindex b03d8e5578..5ddb088195 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrNewRemote.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrNewRemote.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrOpenTextEditor.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrOpenTextEditor.png Binary files differindex 0c36987620..4feafa64d7 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrOpenTextEditor.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrOpenTextEditor.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrPasteRepositoryPath.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrPasteRepositoryPath.png Binary files differindex 9be3faa8d7..9f353037da 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrPasteRepositoryPath.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrPasteRepositoryPath.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrPropertiesView.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrPropertiesView.png Binary files differindex cb29ed1b27..e43736d076 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrPropertiesView.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrPropertiesView.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRefresh.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRefresh.png Binary files differindex fb759f0f28..f14319a6b5 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRefresh.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRefresh.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRemoteConfig.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRemoteConfig.png Binary files differindex 1dc3594d17..c6d8190c82 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRemoteConfig.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRemoteConfig.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRemoteCreated.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRemoteCreated.png Binary files differindex 897034dbb2..afb0e6a165 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRemoteCreated.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrRemoteCreated.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSearchDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSearchDialog.png Binary files differindex 55d476466b..787c12ef65 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSearchDialog.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSearchDialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrShowIn.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrShowIn.png Binary files differdeleted file mode 100644 index 41388ca118..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrShowIn.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSimpleFetch.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSimpleFetch.png Binary files differindex 57d33f48fe..6388533946 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSimpleFetch.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSimpleFetch.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrTopLevelNodes.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrTopLevelNodes.png Binary files differindex c9653b85fb..02f6165229 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrTopLevelNodes.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrTopLevelNodes.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrViewWithRepos.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrViewWithRepos.png Binary files differindex d886af96d5..06facd3ee5 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrViewWithRepos.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrViewWithRepos.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ResolvedConflicts.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ResolvedConflicts.png Binary files differindex 705ccf7a3a..e532a15ae0 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/ResolvedConflicts.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/ResolvedConflicts.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Stop.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Stop.png Binary files differdeleted file mode 100644 index 50c43021d9..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Stop.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Synchronize-dialog.jpg b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Synchronize-dialog.jpg Binary files differindex 9414f64af9..3bd20ddf68 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Synchronize-dialog.jpg +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Synchronize-dialog.jpg diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/TagCreation.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/TagCreation.png Binary files differindex 96628a3ccc..f94809077f 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/TagCreation.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/TagCreation.png diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/0.9.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/0.10.html index 21ec91a8ae..c1fef6ba36 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/0.9.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/0.10.html @@ -2,19 +2,19 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy</title> + <title>JGit 0.10 New and Noteworthy</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">JGit 0.9 New and Noteworthy</th> + <th style="width: 100%" align="center" colspan="3">JGit 0.10 New and Noteworthy</th> </tr> <tr> <td style="width: 20%" align="left"></td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Git-Porcelain-API-Updates.html" title="Git Porcelain API Updates"> + <a href="HTTP-basic-and-digest-authentication.html" title="HTTP basic and digest authentication"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -22,19 +22,20 @@ <tr> <td style="width: 20%" align="left" valign="top"></td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Git Porcelain API Updates</td> + <td style="width: 20%" align="right" valign="top">HTTP basic and digest authentication</td> </tr> </table><hr/> - <h1 id="User_Guide">User Guide</h1> - <p>JGit now has a - <a href="http://wiki.eclipse.org/JGit/User_Guide" target="egit_external">user guide</a> available on the Eclipse wiki. - </p><hr/> + <h1 id="Histogram_Diff">Histogram Diff</h1> + <p>A new histogram diff algorithm derived from + <a href="http://bramcohen.livejournal.com/73318.html" target="egit_external">Bram Cohen's Patience Diff algorithm</a> has been implemented which yields better readable diffs for real-world source code diffs. + </p> + <p>See the <code>HistogramDiff</code> class.</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"></td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Git-Porcelain-API-Updates.html" title="Git Porcelain API Updates"> + <a href="HTTP-basic-and-digest-authentication.html" title="HTTP basic and digest authentication"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -42,7 +43,7 @@ <tr> <td style="width: 20%" align="left" valign="top"></td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Git Porcelain API Updates</td> + <td style="width: 20%" align="right" valign="top">HTTP basic and digest authentication</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Delta-pack-generation.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Bugs-Closed.html index e08cbef276..0b4997abb2 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Delta-pack-generation.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Bugs-Closed.html @@ -2,17 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - Delta pack generation</title> + <title>JGit 0.10 New and Noteworthy - Bugs Closed</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">Delta pack generation</th> + <th style="width: 100%" align="center" colspan="3">Bugs Closed</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="Streaming-large-Objects.html" title="Streaming large Objects"> + <a href="User-Guide.html" title="User Guide"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,27 +24,25 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Streaming large Objects</td> + <td style="width: 20%" align="left" valign="top">User Guide</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Commits</td> </tr> </table><hr/> - <h1 id="Delta_pack_generation">Delta pack generation</h1> - <p>JGit now supports delta pack generation which is equivalent to - <b>git repack</b> - or the first half of - <b>git gc</b>. + <h1 id="Bugs_Closed">Bugs Closed</h1> + <p> + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfieldto=2010-12-15;query_format=advanced;chfield=bug_status;chfieldfrom=2010-09-23;bug_status=RESOLVED;bug_status=CLOSED;resolution=FIXED;classification=Technology;product=JGit" target="egit_external">31 JGit Bugs</a> have been closed since 0.9 </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Streaming-large-Objects.html" title="Streaming large Objects"> + <a href="User-Guide.html" title="User Guide"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -54,7 +52,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Streaming large Objects</td> + <td style="width: 20%" align="left" valign="top">User Guide</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Commits</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Commits.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Commits.html index a5db4416ad..137b7aa0a4 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Commits.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Commits.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 0.9 New and Noteworthy - Commits</title> + <title>JGit 0.10 New and Noteworthy - Commits</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="Git-Configuration-Editor.html" title="Git Configuration Editor"> + <a href="Bugs-Closed.html" title="Bugs Closed"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,26 +24,25 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Git Configuration Editor</td> + <td style="width: 20%" align="left" valign="top">Bugs Closed</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> </table><hr/> <h1 id="Commits">Commits</h1> <p> - <a href="http://egit.eclipse.org/w/?p=egit.git;a=shortlog;h=v0.9.1;hp=v0.8.4;opt=--no-merges" target="egit_external">0.9.1 Changelog in gitweb</a> - </p> - <p>There were 348 commits total!</p><hr/> + <a href="http://egit.eclipse.org/w/?p=jgit.git;a=shortlog;h=stable-0.10;hp=v0.9.3;opt=--no-merges" target="egit_external">JGit 0.10 - commits in gitweb</a> + </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Git-Configuration-Editor.html" title="Git Configuration Editor"> + <a href="Bugs-Closed.html" title="Bugs Closed"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> - <img alt="EGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -53,7 +52,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Git Configuration Editor</td> + <td style="width: 20%" align="left" valign="top">Bugs Closed</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Git-Porcelain-API-Updates.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Git-Porcelain-API-Updates.html index 74bcbb0678..17358dd05f 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Git-Porcelain-API-Updates.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Git-Porcelain-API-Updates.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - Git Porcelain API Updates</title> + <title>JGit 0.10 New and Noteworthy - Git Porcelain API Updates</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,57 +12,63 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> + <a href="Performance-New-IndexDiffFilter.html" title="Performance: New IndexDiffFilter"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="-gitignore-Support.html" title=".gitignore Support"> + <a href="User-Guide.html" title="User Guide"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">JGit 0.9 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">Performance: New IndexDiffFilter</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">.gitignore Support</td> + <td style="width: 20%" align="right" valign="top">User Guide</td> </tr> </table><hr/> <h1 id="Git_Porcelain_API_Updates">Git Porcelain API Updates</h1> - <p>A few more Git porcelain commands were added to the + <p>More Git porcelain commands were added to the <b>org.eclipse.jgit.api</b> package </p> <ul> - <li>AddCommand</li> - <li>TagCommand</li> - <li>MergeCommand</li> - </ul> - <p>Exceptions for these porcelain commands have been moved to the - <b>org.eclipse.jgit.api.errors</b> package. - </p><hr/> + <li><code>CheckoutCommand</code></li> + <li><code>CherryPickCommand</code></li> + <li><code>CreateBranchCommand</code></li> + <li><code>DeleteBranchCommand</code></li> + <li><code>FetchCommand</code></li> + <li><code>InitCommand</code></li> + <li><code>ListBranchCommand</code></li> + <li><code>PullCommand</code></li> + <li><code>PushCommand</code></li> + <li><code>RebaseCommand</code></li> + <li><code>RenameBranchCommand</code></li> + <li><code>RmCommand</code></li> + </ul><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> + <a href="Performance-New-IndexDiffFilter.html" title="Performance: New IndexDiffFilter"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> - <a href="-gitignore-Support.html" title=".gitignore Support"> + <a href="User-Guide.html" title="User Guide"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">JGit 0.9 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">Performance: New IndexDiffFilter</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">.gitignore Support</td> + <td style="width: 20%" align="right" valign="top">User Guide</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html new file mode 100644 index 0000000000..34028a812a --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html @@ -0,0 +1,61 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit 0.10 New and Noteworthy - HTTP basic and digest authentication</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">HTTP basic and digest authentication</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Performance-New-IndexDiffFilter.html" title="Performance: New IndexDiffFilter"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">JGit 0.10 New and Noteworthy</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Performance: New IndexDiffFilter</td> + </tr> + </table><hr/> + <h1 id="HTTP_basic_and_digest_authentication">HTTP basic and digest authentication</h1> + <p>We natively support the HTTP basic and digest authentication methods + by setting the Authorization header.</p> + <p>See the <code>HttpAuthMethod</code> class.</p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Performance-New-IndexDiffFilter.html" title="Performance: New IndexDiffFilter"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">JGit 0.10 New and Noteworthy</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Performance: New IndexDiffFilter</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html new file mode 100644 index 0000000000..4d276243bd --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html @@ -0,0 +1,60 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit 0.10 New and Noteworthy - Performance: New IndexDiffFilter</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">Performance: New IndexDiffFilter</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="HTTP-basic-and-digest-authentication.html" title="HTTP basic and digest authentication"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Git-Porcelain-API-Updates.html" title="Git Porcelain API Updates"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">HTTP basic and digest authentication</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Git Porcelain API Updates</td> + </tr> + </table><hr/> + <h1 id="Performance:_New_IndexDiffFilter">Performance: New IndexDiffFilter</h1> + <p>The new IndexDiffFilter speeds up walking the working tree heavily. This e.g. helps to bring up the commit dialog on large repositories much faster.</p> + <p>See the <code>IndexDiffFilter</code> class.</p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="HTTP-basic-and-digest-authentication.html" title="HTTP basic and digest authentication"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Git-Porcelain-API-Updates.html" title="Git Porcelain API Updates"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">HTTP basic and digest authentication</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Git Porcelain API Updates</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Updating-This-Document.html index e39dd7bed7..7b82adc756 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.9/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Updating-This-Document.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 0.9 New and Noteworthy - Updating This Document</title> + <title>JGit 0.10 New and Noteworthy - Updating This Document</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -28,8 +28,8 @@ <h1 id="Updating_This_Document">Updating This Document</h1> <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - - <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.9" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.9</a> + + <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/0.10" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/0.10</a> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -39,8 +39,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="EGit 0.9 New and Noteworthy"> - <img alt="EGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"></td> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/-gitignore-Support.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/User-Guide.html index ea215aa6a6..5fbec4fd09 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/-gitignore-Support.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/User-Guide.html @@ -2,13 +2,13 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - .gitignore Support</title> + <title>JGit 0.10 New and Noteworthy - User Guide</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> - <th style="width: 100%" align="center" colspan="3">.gitignore Support</th> + <th style="width: 100%" align="center" colspan="3">User Guide</th> </tr> <tr> <td style="width: 20%" align="left"> @@ -18,7 +18,7 @@ </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Improved-Persistency-Support.html" title="Improved Persistency Support"> + <a href="Bugs-Closed.html" title="Bugs Closed"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -26,12 +26,12 @@ <tr> <td style="width: 20%" align="left" valign="top">Git Porcelain API Updates</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Improved Persistency Support</td> + <td style="width: 20%" align="right" valign="top">Bugs Closed</td> </tr> </table><hr/> - <h1 id=".gitignore_Support">.gitignore Support</h1> - <p>JGit now respects entries in .gitignore... see - <b>org.eclipse.jgit.treewalk.WorkingTreeIterator.isEntryIgnored()</b> + <h1 id="User_Guide">User Guide</h1> + <p>The + <a href="../../../JGit/User_Guide/User-Guide.html" title="JGit/User_Guide">User Guide</a> has been enhanced. </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -41,12 +41,12 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="0.10.html" title="JGit 0.10 New and Noteworthy"> + <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> - <a href="Improved-Persistency-Support.html" title="Improved Persistency Support"> + <a href="Bugs-Closed.html" title="Bugs Closed"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -54,7 +54,7 @@ <tr> <td style="width: 20%" align="left" valign="top">Git Porcelain API Updates</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Improved Persistency Support</td> + <td style="width: 20%" align="right" valign="top">Bugs Closed</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/DirCacheCheckout.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/DirCacheCheckout.html deleted file mode 100644 index 9a91ac9329..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/DirCacheCheckout.html +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - DirCacheCheckout</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">DirCacheCheckout</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Rename-Detection.html" title="Rename Detection"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Resolve-Merge-Strategy.html" title="Resolve Merge Strategy"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Rename Detection</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Resolve Merge Strategy</td> - </tr> - </table><hr/> - <h1 id="DirCacheCheckout">DirCacheCheckout</h1> - <p>JGit now has a new DirCache based checkout implementation supporting all 3 index stages. - - <br/> - See - <b>org.eclipse.jgit.dircache.DirCacheCheckout</b> and tests for examples. - </p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Rename-Detection.html" title="Rename Detection"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Resolve-Merge-Strategy.html" title="Resolve Merge Strategy"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Rename Detection</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Resolve Merge Strategy</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Improved-Persistency-Support.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Improved-Persistency-Support.html deleted file mode 100644 index ead08eeef0..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Improved-Persistency-Support.html +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - Improved Persistency Support</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Improved Persistency Support</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="-gitignore-Support.html" title=".gitignore Support"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Rename-Detection.html" title="Rename Detection"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">.gitignore Support</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Rename Detection</td> - </tr> - </table><hr/> - <h1 id="Improved_Persistency_Support">Improved Persistency Support</h1> - <p>There was refactoring to prepare support of non-filesystem persistency so JGit can run on the cloud.</p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="-gitignore-Support.html" title=".gitignore Support"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Rename-Detection.html" title="Rename Detection"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">.gitignore Support</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Rename Detection</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Resolve-Merge-Strategy.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Resolve-Merge-Strategy.html deleted file mode 100644 index 7f64ed9508..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.9/Resolve-Merge-Strategy.html +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 0.9 New and Noteworthy - Resolve Merge Strategy</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Resolve Merge Strategy</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="DirCacheCheckout.html" title="DirCacheCheckout"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Streaming-large-Objects.html" title="Streaming large Objects"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">DirCacheCheckout</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Streaming large Objects</td> - </tr> - </table><hr/> - <h1 id="Resolve_Merge_Strategy">Resolve Merge Strategy</h1> - <p>JGit now supports the resolve merge strategy providing true content merge. - - <br/> - See the - <b>org.eclipse.jgit.api.MergeCommand</b> and tests for examples. - </p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="DirCacheCheckout.html" title="DirCacheCheckout"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="0.9.html" title="JGit 0.9 New and Noteworthy"> - <img alt="JGit 0.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Streaming-large-Objects.html" title="Streaming large Objects"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">DirCacheCheckout</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Streaming large Objects</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/Advanced-Topics.html b/org.eclipse.egit.doc/help/JGit/User_Guide/Advanced-Topics.html new file mode 100644 index 0000000000..e39512b856 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/User_Guide/Advanced-Topics.html @@ -0,0 +1,164 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit User Guide - Advanced Topics</title> + <link type="text/css" rel="stylesheet" href="../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">Advanced Topics</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Reference.html" title="Reference"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Updating-This-Document.html" title="Updating This Document"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Reference</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Updating This Document</td> + </tr> + </table><hr/> + <h1 id="Advanced_Topics">Advanced Topics</h1> + <h2 id="Reducing_memory_usage_with_RevWalk">Reducing memory usage with RevWalk</h2> + <p>The revision walk interface and the RevWalk and RevCommit + classes are designed to be light-weight. However, when used + with any repository of considerable size they may still + require a lot of memory. This section provides hints on what + you can do to reduce memory when walking the revision graph.</p> + <h3 id="Restrict_the_walked_revision_graph">Restrict the walked revision graph</h3> + <p>Try to walk only the amount of the graph you + actually need to walk. That is, if you are looking for the commits in + refs/heads/master not yet in refs/remotes/origin/master, make sure you + markStart() for refs/heads/master and markUninteresting() + refs/remotes/origin/master. The RevWalk traversal will only parse the + commits necessary for it to answer you, and will try to avoid looking + back further in history. That reduces the size of the internal object + map, and thus reduces overall memory usage.</p> + <p><source lang="java"> + RevWalk walk = new RevWalk(repository); + ObjectId from = repository.resolve("refs/heads/master"); + ObjectId to = repository.resolve("refs/remotes/origin/master");</p> + <p>walk.markStart(walk.parseCommit(from)); + walk.markUninteresting(walk.parseCommit(to));</p> + <p>// ... + </source></p> + <h3 id="Discard_the_body_of_a_commit">Discard the body of a commit</h3> + <p>There is a setRetainBody(false) method you can use to discard the body + of a commit if you don't need the author, committer or message + information during the traversal. Examples of when you don't need + this data is when you are only using the RevWalk to compute the merge + base between branches, or to perform a task you would have used `git + rev-list` with its default formatting for.</p> + <p><source lang="java"> + RevWalk walk = new RevWalk(repository); + walk.setRetainBody(false); + // ... + </source></p> + <p>If you do need the body, consider extracting the data you need and + then calling dispose() on the RevCommit, assuming you only need the + data once and can then discard it. If you need to hang onto the data, + you may find that JGit's internal representation uses less overall + memory than if you held onto it yourself, especially if you want the + full message. This is because JGit uses a byte[] internally to store the + message in UTF-8. Java String storage would be bigger using UTF-16, + assuming the message is mostly US-ASCII data.</p> + <p><source lang="java"> + RevWalk walk = new RevWalk(repository); + // more setup + Set<String> authorEmails = new HashSet<String>();</p> + <p>for (RevCommit commit : walk) { + // extract the commit fields you need, for example: + authorEmails.add(commit.getAuthorIdent().getEmailAddress());</p> + <p> commit.dispose(); + } + </source></p> + <h3 id="Subclassing_RevWalk_and_RevCommit">Subclassing RevWalk and RevCommit</h3> + <p>If you need to attach additional data to a commit, consider + subclassing both RevWalk and RevCommit, and using the createCommit() + method in RevWalk to consruct an instance of your RevCommit subclass. + Put the additional data as fields in your RevCommit subclass, so that + you don't need to use an auxiliary HashMap to translate from RevCommit + or ObjectId to your additional data fields.</p> + <p><source lang="java"> + public class ReviewedRevision extends RevCommit {</p> + <p> private final Date reviewDate;</p> + <p> private ReviewedRevision(AnyObjectId id, Date reviewDate) { + super(id); + this.reviewDate = reviewDate; + }</p> + <p> public List<String> getReviewedBy() { + return getFooterLines("Reviewed-by"); + }</p> + <p> public Date getReviewDate() { + return reviewDate; + }</p> + <p> public static class Walk extends RevWalk {</p> + <p> public Walk(Repository repo) { + super(repo); + }</p> + <p> @Override + protected RevCommit createCommit(AnyObjectId id) { + return new ReviewedRevision(id, getReviewDate(id)); + }</p> + <p> private Date getReviewDate(AnyObjectId id) { + // ... + }</p> + <p> } + } + </source></p> + <h3 id="Cleaning_up_after_a_revision_walk">Cleaning up after a revision walk</h3> + <p>A RevWalk cannot shrink its internal object map. If you have just + done a huge traversal of say all history of the repository, that will + load everything into the object map, and it cannot be released. If + you don't need this data in the near future, it may be a good idea to + throw away the RevWalk and allocate a new one for your next traversal. + That will let the GC reclaim everything and make it available for + another use. On the other hand, reusing an existing object map is + much faster than building a new one from scratch. So you need to + balance the reclaiming of memory against the user's desire to perform + fast updates of an existing repository view.</p> + <p><source lang="java"> + RevWalk walk = new RevWalk(repository); + // ... + for (RevCommit commit : walk) { + // ... + } + walk.dispose(); + </source></p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Reference.html" title="Reference"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="User-Guide.html" title="JGit User Guide"> + <img alt="JGit User Guide" border="0" src="../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Updating-This-Document.html" title="Updating This Document"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Reference</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Updating This Document</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/Concepts.html b/org.eclipse.egit.doc/help/JGit/User_Guide/Concepts.html new file mode 100644 index 0000000000..f617b133de --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/User_Guide/Concepts.html @@ -0,0 +1,152 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit User Guide - Concepts</title> + <link type="text/css" rel="stylesheet" href="../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">Concepts</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="User-Guide.html" title="JGit User Guide"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Reference.html" title="Reference"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">JGit User Guide</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Reference</td> + </tr> + </table><hr/> + <h1 id="Concepts">Concepts</h1> + <h2 id="API">API</h2> + <h3 id="Repository">Repository</h3> + <p>A + <b>Repository</b> holds all objects and refs used for managing source code. + </p> + <p>To build a repository, you invoke flavors of + <b>RepositoryBuilder</b>. + </p> + <p><source lang="java"> + FileRepositoryBuilder builder = new RepositoryBuilder(); + Repository repository = builder.setGitDir("/my/git/directory") + .readEnvironment() // scan environment GIT_* variables + .findGitDir() // scan up the file system tree + .build(); + </source></p> + <h3 id="Git_Objects">Git Objects</h3> + <p>All objects are represented by a SHA-1 id in the Git object model. In JGit, this is represented by the + <b>AnyObjectId</b> and + <b>ObjectId</b> classes. + </p> + <p>There are four types of objects in the Git object model:</p> + <ul> + <li>blob + <ul> + <li>is used to store file data</li> + </ul> + </li> + <li>tree + <ul> + <li>can be thought of as a directory; it references other trees and blobs</li> + </ul> + </li> + <li>commit + <ul> + <li>a commit points to a single tree</li> + </ul> + </li> + <li>tag + <ul> + <li>marks a commit as special; generally used to mark specific releases</li> + </ul> + </li> + </ul> + <p>To resolve an object from a repository, simply pass in the right revision string.</p> + <p><source lang="java"> + ObjectId head = repository.resolve("HEAD"); + </source></p> + <h3 id="Ref">Ref</h3> + <p>A ref is a variable that holds a single object identifier. The object identifier can be any valid Git object (blob, tree, commit, tag).</p> + <p>For example, to query for the reference to head, you can simply call</p> + <p><source lang="java"> + Ref HEAD = repository.getRef("refs/heads/master"); + </source></p> + <h3 id="RevWalk">RevWalk</h3> + <p>A + <b>RevWalk</b> walks a commit graph and produces the matching commits in order. + </p> + <p><source lang="java"> + RevWalk walk = new RevWalk(repository); + </source></p> + <p>TODO talk about filters</p> + <h3 id="RevCommit">RevCommit</h3> + <p>A + <b>RevCommit</b> represents a commit in the Git object model. + </p> + <p>To parse a commit, simply use a + <b>RevWalk</b> instance: + </p> + <p><source lang="java"> + RevWalk walk = new RevWalk(repository); + RevCommit commit = walk.parseCommit(objectIdOfCommit); + </source></p> + <h3 id="RevTag">RevTag</h3> + <p>A + <b>RevTag</b> represents a tag in the Git object model. + </p> + <p>To parse a tag, simply use a + <b>RevWalk</b> instance: + </p> + <p><source lang="java"> + RevWalk walk = new RevWalk(repository); + RevTag tag = walk.parseTag(objectIdOfTag); + </source></p> + <h3 id="RevTree">RevTree</h3> + <p>A + <b>RevTree</b> represents a tree in the Git object model. + </p> + <p>To parse a commit, simply use a + <b>RevWalk</b> instance: + </p> + <p><source lang="java"> + RevWalk walk = new RevWalk(repository); + RevTree tree = walk.parseTree(objectIdOfTree); + </source></p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="User-Guide.html" title="JGit User Guide"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="User-Guide.html" title="JGit User Guide"> + <img alt="JGit User Guide" border="0" src="../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Reference.html" title="Reference"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">JGit User Guide</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Reference</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/Reference.html b/org.eclipse.egit.doc/help/JGit/User_Guide/Reference.html new file mode 100644 index 0000000000..74e5e6098d --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/User_Guide/Reference.html @@ -0,0 +1,116 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit User Guide - Reference</title> + <link type="text/css" rel="stylesheet" href="../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">Reference</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Concepts.html" title="Concepts"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Advanced-Topics.html" title="Advanced Topics"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Concepts</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Advanced Topics</td> + </tr> + </table><hr/> + <h1 id="Reference">Reference</h1> + <h2 id="Porcelain_API">Porcelain API</h2> + <p>While JGit contains a lot of low level code to work with Git repositories, it also contains a higher level API that mimics some of the Git porcelain commands in the + <i>org.eclipse.jgit.api</i> package. + </p> + <p>Most users of JGit should start here.</p> + <h3 id="AddCommand_.28git-add.29">AddCommand (git-add)</h3> + <p>AddCommand allows you to add files to the index and has options available via its setter methods.</p> + <ul> + <li>addFilepattern()</li> + </ul> + <p>Here's a quick example of how to add a set of files to the index using the porcelain API.</p> + <p><source lang="java"> + Git git = new Git(db); + AddCommand add = git.add(); + add.addFilepattern("someDirectory").call(); + </source></p> + <h3 id="CommitCommand_.28git-commit.29">CommitCommand (git-commit)</h3> + <p>CommitCommand allows you to perform commits and has options available via its setter methods.</p> + <ul> + <li>setAuthor()</li> + <li>setCommitter()</li> + <li>setAll()</li> + </ul> + <p>Here's a quick example of how to commit using the porcelain API.</p> + <p><source lang="java"> + Git git = new Git(db); + CommitCommand commit = git.commit(); + commit.setMessage("initial commit").call(); + </source></p> + <h3 id="TagCommand_.28git-tag.29">TagCommand (git-tag)</h3> + <p>TagCommand supports a variety of tagging options through its setter methods.</p> + <ul> + <li>setName()</li> + <li>setMessage()</li> + <li>setTagger()</li> + <li>setObjectId()</li> + <li>setForceUpdate()</li> + <li>setSigned() - not supported yet, will throw exception</li> + </ul> + <p>Here's a quick example of how to tag a commit using the porcelain API.</p> + <p><source lang="java"> + Git git = new Git(db); + RevCommit commit = git.commit().setMessage("initial commit").call(); + RevTag tag = git.tag().setName("tag").call(); + </source></p> + <h3 id="LogCommand_.28git-log.29">LogCommand (git-log)</h3> + <p>LogCommand allows you to easily walk a commit graph.</p> + <ul> + <li>add(AnyObjectId start)</li> + <li>addRange(AnyObjectId since, AnyObjectId until)</li> + </ul> + <p>Here's a quick example of how get some log messages.</p> + <p><source lang="java"> + Git git = new Git(db); + LogCommand log = git.log().call(); + </source></p> + <h3 id="MergeCommand_.28git-merge.29">MergeCommand (git-merge)</h3> + <p>TODO</p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Concepts.html" title="Concepts"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="User-Guide.html" title="JGit User Guide"> + <img alt="JGit User Guide" border="0" src="../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Advanced-Topics.html" title="Advanced Topics"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Concepts</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Advanced Topics</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/User_Guide/Updating-This-Document.html new file mode 100644 index 0000000000..35d2f80daf --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/User_Guide/Updating-This-Document.html @@ -0,0 +1,55 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit User Guide - Updating This Document</title> + <link type="text/css" rel="stylesheet" href="../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">Updating This Document</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Advanced-Topics.html" title="Advanced Topics"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"></td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Advanced Topics</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top"></td> + </tr> + </table><hr/> + <h1 id="Updating_This_Document">Updating This Document</h1> + <p> This document is maintained in a collaborative wiki. If you wish to + update or modify this document please visit + + <a href="http://wiki.eclipse.org/JGit/User_Guide" target="egit_external">http://wiki.eclipse.org/JGit/User_Guide</a> + </p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Advanced-Topics.html" title="Advanced Topics"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="User-Guide.html" title="JGit User Guide"> + <img alt="JGit User Guide" border="0" src="../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"></td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Advanced Topics</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top"></td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html b/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html new file mode 100644 index 0000000000..8470268c09 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html @@ -0,0 +1,133 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit User Guide</title> + <link type="text/css" rel="stylesheet" href="../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">JGit User Guide</th> + </tr> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Concepts.html" title="Concepts"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Concepts</td> + </tr> + </table><hr/> + <h1 id="Getting_Started">Getting Started</h1> + <p>If you're new to Git or distributed version control systems generally, then you might want to read + <a href="../../EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" title="EGit/Git For Eclipse Users">Git for Eclipse Users</a> first. If you need more details and background read the + <a href="http://book.git-scm.com" target="egit_external">Git Community Book</a> or + <a href="http://progit.org/book/" target="egit_external">Git Pro</a>. + </p> + <h2 id="Taking_JGit_for_a_Spin">Taking JGit for a Spin</h2> + <p>Although you are probably interested in JGit because you want to integrate it into an existing application or create a tool, JGit is more than simply a Java library for working with git repository. So before diving into the different aspects of the library let's take JGit for a spin.</p> + <p>You are probably familiar with the git command line interface (CLI) that can be used from the shell or in scripts. JGit comes with its own small CLI, which, although not as feature-full as the git CLI, is a good way to showcase what JGIt can do. Furthermore, the programs serve as an excellent source of inspiration for how to accomplish different tasks. </p> + <h3 id="Building_the_JGit_CLI">Building the JGit CLI</h3> + <p>Assuming that you have the EGit git repository cloned and ready, build the jgit binary by running the jgit maven build (see + <a href="http://wiki.eclipse.org/EGit/Contributor_Guide#JGit" title="EGit/Contributor_Guide#JGit" target="egit_external">the Contributor Guide</a>): + </p> + <pre>~/src/jgit$ mvn clean install +</pre> + <p>Find the jgit binary here (path relative to root of working tree of your clone of the jgit repository): </p> + <pre>org.eclipse.jgit.pgm/target/jgit +</pre> + <p>Check your build by running the "version" command:</p> + <pre>prompt$ ./jgit version +jgit version 0.10.0-SNAPSHOT +</pre> + <p>If you want to use jgit frequently you may consider to ease running it via a symbolic link (usually goes under /usr/local/bin)</p> + <pre>sudo ln -s /path/to/jgit /usr/local/bin/jgit +</pre> + <h3 id="Running_the_JGit_CLI">Running the JGit CLI</h3> + <h4 id="Overview">Overview</h4> + <p>When given the + <i>'-h</i>' flag, commands provide a helpful message listing what flags they support. + </p> + <pre>prompt$ ./jgit version -h +jgit version [--help (-h)] +</pre> + <pre> --help (-h) : display this help text +</pre> + <p>Running + <b>jgit</b> with no arguments lists the most commonly used commands. + </p> + <pre>prompt$ ./jgit +jgit --git-dir GIT_DIR --help (-h) --show-stack-trace command [ARG ...] +</pre> + <pre>The most commonly used commands are: + branch List, create, or delete branches + clone Clone a repository into a new directory + commit Record changes to the repository + daemon Export repositories over git:// + diff Show diffs + fetch Update remote refs from another repository + init Create an empty git repository + log View commit history + push Update remote repository from local refs + rm Stop tracking a file + tag Create a tag + version Display the version of jgit +</pre> + <p>The commands are modeled after their corresponding command in the git CLI. + We will not cover all the commands here, but simply give some examples.</p> + <p> + <b>jgit</b> also provides a number of debug and test commands, to list all the available commands run + </p> + <pre>prompt$ ./jgit debug-show-commands +</pre> + <h4 id="Inspecting_the_Repository">Inspecting the Repository</h4> + <p>Before inspecting the most recent commits, you probably want to know which branches the repository contains and what branch is currently checked out. Using the branch commands -v flag, you get a small summary of branches, their revision, and the first line of the revision's commit message.</p> + <pre>prompt$ ./jgit branch -v + master 4d4adfb Git Project import: don't hide but gray out existing projects +* traceHistory 6b9fe04 [historyView] Add trace instrumentation +</pre> + <p>The log command, like + <a href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html" target="egit_external">git-log(1)</a>, shows the commit log. For example, + </p> + <pre>prompt$ ./jgit log --author Matthias --grep tycho master +commit 482442b599abf75b63b397680aaff09c4e48c0ed +Author: Matthias Sohn <matthias.sohn@sap.com> +Date: Fri Oct 08 10:58:52 2010 +0200 +</pre> + <pre> Update build to use tycho 0.10.0 +... +</pre> + <p>will show you all commits in the "master" branch, where the author name matches "Matthias" and the commit messages contains the word tycho. More search criteria to filter the commit log, such as committer name, can be given.</p> + <h4 id="Graphical_History_View">Graphical History View</h4> + <p>Finally, to show some of the graphical capabilities of JGit, we will end this small tour by launching the graphical log tool.</p> + <pre>prompt$ ./jgit glog +</pre> + <p>This should give you a window with the revision graph plotted to the left and three columns containing the first line of the message, the author name, and the commit date.</p> + <p> + <img border="0" src="images/Jgit-glog.png"/> + </p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Concepts.html" title="Concepts"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Concepts</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/images/Jgit-glog.png b/org.eclipse.egit.doc/help/JGit/User_Guide/images/Jgit-glog.png Binary files differnew file mode 100644 index 0000000000..5153feda86 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/User_Guide/images/Jgit-glog.png diff --git a/org.eclipse.egit.doc/help/images/topiclabel/git48.png b/org.eclipse.egit.doc/help/images/topiclabel/git48.png Binary files differnew file mode 100644 index 0000000000..a004457677 --- /dev/null +++ b/org.eclipse.egit.doc/help/images/topiclabel/git48.png diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml index 5bbb4a03ae..97a42e627e 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -3,7 +3,12 @@ <topic href="help/EGit/User_Guide/User-Guide.html" label="EGit User Guide"> <topic href="help/EGit/User_Guide/User-Guide.html" label="Getting Started"> <topic href="help/EGit/User_Guide/User-Guide.html#Overview" label="Overview"></topic> - <topic href="help/EGit/User_Guide/User-Guide.html#Basic_Tutorial:_Adding_a_project_to_version_control" label="Basic Tutorial: Adding a project to version control"></topic> + <topic href="help/EGit/User_Guide/User-Guide.html#Basic_Tutorial:_Adding_a_project_to_version_control" label="Basic Tutorial: Adding a project to version control"> + <topic href="help/EGit/User_Guide/User-Guide.html#Configuration" label="Configuration"></topic> + <topic href="help/EGit/User_Guide/User-Guide.html#Create_Repository" label="Create Repository"></topic> + <topic href="help/EGit/User_Guide/User-Guide.html#Track_Changes" label="Track Changes"></topic> + <topic href="help/EGit/User_Guide/User-Guide.html#Inspect_History" label="Inspect History"></topic> + </topic> <topic href="help/EGit/User_Guide/User-Guide.html#Github_Tutorial" label="Github Tutorial"> <topic href="help/EGit/User_Guide/User-Guide.html#Create_Local_Repository" label="Create Local Repository"></topic> <topic href="help/EGit/User_Guide/User-Guide.html#Create_Repository_at_GitHub" label="Create Repository at GitHub"></topic> @@ -121,12 +126,28 @@ </topic> </topic> <topic href="help/EGit/User_Guide/Tasks.html#Resolving_a_merge_conflict" label="Resolving a merge conflict"> + <topic href="help/EGit/User_Guide/Tasks.html#Using_Merge_Tool" label="Using Merge Tool"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Manual_conflict_resolution" label="Manual conflict resolution"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Finding_conflicting_files" label="Finding conflicting files"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Editing_conflicting_files" label="Editing conflicting files"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Adding_conflict_resolution_to_the_git_index" label="Adding conflict resolution to the git index"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Committing_a_merge" label="Committing a merge"></topic> </topic> - <topic href="help/EGit/User_Guide/Tasks.html#Aborting_merge" label="Aborting merge"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Aborting_Merge" label="Aborting Merge"></topic> + </topic> + <topic href="help/EGit/User_Guide/Tasks.html#Rebasing" label="Rebasing"> + <topic href="help/EGit/User_Guide/Tasks.html#Rebase_Introduction" label="Rebase Introduction"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Rebase.2C_A_Simple_Example" label="Rebase, A Simple Example"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#The_Real_World:_Rebase_Conflicts" label="The Real World: Rebase Conflicts"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Starting_Rebase" label="Starting Rebase"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Rebase_Confirmation_Dialog" label="Rebase Confirmation Dialog"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Rebase_Conflicts" label="Rebase Conflicts"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Aborting_Rebase" label="Aborting Rebase"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Rebase_Limitation" label="Rebase Limitation"></topic> + </topic> + <topic href="help/EGit/User_Guide/Tasks.html#Cherry_Picking" label="Cherry Picking"> + <topic href="help/EGit/User_Guide/Tasks.html#Cherry-pick_Introduction" label="Cherry-pick Introduction"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Cherry-pick_Example" label="Cherry-pick Example"></topic> </topic> <topic href="help/EGit/User_Guide/Tasks.html#Tagging" label="Tagging"> <topic href="help/EGit/User_Guide/Tasks.html#Creating_a_Tag" label="Creating a Tag"></topic> @@ -145,7 +166,11 @@ <topic href="help/EGit/User_Guide/Tasks.html#Adding_a_Repository_manually" label="Adding a Repository manually"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Cloning_a_Repository_2" label="Cloning a Repository"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Creating_a_Repository" label="Creating a Repository"></topic> - <topic href="help/EGit/User_Guide/Tasks.html#Adding_a_Repository_using_copy_and_paste" label="Adding a Repository using copy and paste"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Adding_a_Repository_using_Copy_and_Paste" label="Adding a Repository using Copy and Paste"></topic> + </topic> + <topic href="help/EGit/User_Guide/Tasks.html#Removing_Repositories" label="Removing Repositories"> + <topic href="help/EGit/User_Guide/Tasks.html#Removing_a_Repository_from_the_Repositories_View" label="Removing a Repository from the Repositories View"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Deleting_a_Repository" label="Deleting a Repository"></topic> </topic> <topic href="help/EGit/User_Guide/Tasks.html#Structure_of_the_Git_Repositories_View" label="Structure of the Git Repositories View"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Functions_of_the_Git_Repositories_View" label="Functions of the Git Repositories View"> @@ -179,6 +204,8 @@ <topic href="help/EGit/User_Guide/Reference.html#Menus" label="Menus"> <topic href="help/EGit/User_Guide/Reference.html#Project_Context_Menu" label="Project Context Menu"></topic> <topic href="help/EGit/User_Guide/Reference.html#Resource_Context_Menu" label="Resource Context Menu"></topic> + <topic href="help/EGit/User_Guide/Reference.html#Repositories_View_Menus" label="Repositories View Menus"></topic> + <topic href="help/EGit/User_Guide/Reference.html#History_View_Menus" label="History View Menus"></topic> <topic href="help/EGit/User_Guide/Reference.html#Menu_Actions" label="Menu Actions"></topic> </topic> <topic href="help/EGit/User_Guide/Reference.html#Git_Perspective_and_Views" label="Git Perspective and Views"> @@ -233,31 +260,78 @@ <topic href="help/EGit/User_Guide/Reference.html#Refspecs" label="Refspecs"></topic> <topic href="help/EGit/User_Guide/Reference.html#Remotes" label="Remotes"></topic> <topic href="help/EGit/User_Guide/Reference.html#Git_Ignore" label="Git Ignore"></topic> + <topic href="help/EGit/User_Guide/Reference.html#Git_Fetch_Factory_for_PDE_Build" label="Git Fetch Factory for PDE Build"></topic> </topic> <topic href="help/EGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/0.9/0.9.html" label="EGit 0.9 New and Noteworthy"> - <topic href="help/EGit/New_and_Noteworthy/0.9/0.9.html" label="Synchronize View"></topic> - <topic href="help/EGit/New_and_Noteworthy/0.9/Improved-Merge-Support.html" label="Improved Merge Support"></topic> - <topic href="help/EGit/New_and_Noteworthy/0.9/-gitignore-Support.html" label=".gitignore Support"></topic> - <topic href="help/EGit/New_and_Noteworthy/0.9/History-View-Improvements.html" label="History View Improvements"></topic> - <topic href="help/EGit/New_and_Noteworthy/0.9/Repositories-View-Improvements.html" label="Repositories View Improvements"></topic> - <topic href="help/EGit/New_and_Noteworthy/0.9/Git-Configuration-Editor.html" label="Git Configuration Editor"></topic> - <topic href="help/EGit/New_and_Noteworthy/0.9/Commits.html" label="Commits"></topic> - <topic href="help/EGit/New_and_Noteworthy/0.9/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/JGit/User_Guide/User-Guide.html" label="JGit User Guide"> + <topic href="help/JGit/User_Guide/User-Guide.html" label="Getting Started"> + <topic href="help/JGit/User_Guide/User-Guide.html#Taking_JGit_for_a_Spin" label="Taking JGit for a Spin"> + <topic href="help/JGit/User_Guide/User-Guide.html#Building_the_JGit_CLI" label="Building the JGit CLI"></topic> + <topic href="help/JGit/User_Guide/User-Guide.html#Running_the_JGit_CLI" label="Running the JGit CLI"> + <topic href="help/JGit/User_Guide/User-Guide.html#Overview" label="Overview"></topic> + <topic href="help/JGit/User_Guide/User-Guide.html#Inspecting_the_Repository" label="Inspecting the Repository"></topic> + <topic href="help/JGit/User_Guide/User-Guide.html#Graphical_History_View" label="Graphical History View"></topic> + </topic> + </topic> + </topic> + <topic href="help/JGit/User_Guide/Concepts.html" label="Concepts"> + <topic href="help/JGit/User_Guide/Concepts.html#API" label="API"> + <topic href="help/JGit/User_Guide/Concepts.html#Repository" label="Repository"></topic> + <topic href="help/JGit/User_Guide/Concepts.html#Git_Objects" label="Git Objects"></topic> + <topic href="help/JGit/User_Guide/Concepts.html#Ref" label="Ref"></topic> + <topic href="help/JGit/User_Guide/Concepts.html#RevWalk" label="RevWalk"></topic> + <topic href="help/JGit/User_Guide/Concepts.html#RevCommit" label="RevCommit"></topic> + <topic href="help/JGit/User_Guide/Concepts.html#RevTag" label="RevTag"></topic> + <topic href="help/JGit/User_Guide/Concepts.html#RevTree" label="RevTree"></topic> + </topic> + </topic> + <topic href="help/JGit/User_Guide/Reference.html" label="Reference"> + <topic href="help/JGit/User_Guide/Reference.html#Porcelain_API" label="Porcelain API"> + <topic href="help/JGit/User_Guide/Reference.html#AddCommand_.28git-add.29" label="AddCommand (git-add)"></topic> + <topic href="help/JGit/User_Guide/Reference.html#CommitCommand_.28git-commit.29" label="CommitCommand (git-commit)"></topic> + <topic href="help/JGit/User_Guide/Reference.html#TagCommand_.28git-tag.29" label="TagCommand (git-tag)"></topic> + <topic href="help/JGit/User_Guide/Reference.html#LogCommand_.28git-log.29" label="LogCommand (git-log)"></topic> + <topic href="help/JGit/User_Guide/Reference.html#MergeCommand_.28git-merge.29" label="MergeCommand (git-merge)"></topic> + </topic> + </topic> + <topic href="help/JGit/User_Guide/Advanced-Topics.html" label="Advanced Topics"> + <topic href="help/JGit/User_Guide/Advanced-Topics.html#Reducing_memory_usage_with_RevWalk" label="Reducing memory usage with RevWalk"> + <topic href="help/JGit/User_Guide/Advanced-Topics.html#Restrict_the_walked_revision_graph" label="Restrict the walked revision graph"></topic> + <topic href="help/JGit/User_Guide/Advanced-Topics.html#Discard_the_body_of_a_commit" label="Discard the body of a commit"></topic> + <topic href="help/JGit/User_Guide/Advanced-Topics.html#Subclassing_RevWalk_and_RevCommit" label="Subclassing RevWalk and RevCommit"></topic> + <topic href="help/JGit/User_Guide/Advanced-Topics.html#Cleaning_up_after_a_revision_walk" label="Cleaning up after a revision walk"></topic> + </topic> + </topic> + <topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic> + </topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/0.10.html" label="EGit 0.10 New and Noteworthy"> + <topic href="help/EGit/New_and_Noteworthy/0.10/0.10.html" label="Pull Support"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html" label="Rebase Support"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Cherry-pick-Support.html" label="Cherry-pick Support"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html" label="Merge Tool"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.html" label="Synchronize View - Local Changes in Changeset Mode"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/HTTP-Authentication.html" label="HTTP Authentication"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html" label="Repositories View Improvements"> + <topic href="help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html#Drag_and_Drop_Support" label="Drag and Drop Support"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html#Support_for_References" label="Support for References"></topic> + </topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/History-View-Enhancements.html" label="History View Enhancements"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Auto-wrapping-Commit-Messages.html" label="Auto-wrapping Commit Messages"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/PDE-Build-Fetch-Factory.html" label="PDE Build Fetch Factory"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Bugs-Closed.html" label="Bugs Closed"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Commits.html" label="Commits"></topic> + <topic href="help/EGit/New_and_Noteworthy/0.10/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/0.9.html" label="JGit 0.9 New and Noteworthy"> - <topic href="help/JGit/New_and_Noteworthy/0.9/0.9.html" label="User Guide"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/Git-Porcelain-API-Updates.html" label="Git Porcelain API Updates"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/-gitignore-Support.html" label=".gitignore Support"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/Improved-Persistency-Support.html" label="Improved Persistency Support"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/Rename-Detection.html" label="Rename Detection"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/DirCacheCheckout.html" label="DirCacheCheckout"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/Resolve-Merge-Strategy.html" label="Resolve Merge Strategy"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/Streaming-large-Objects.html" label="Streaming large Objects"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/Delta-pack-generation.html" label="Delta pack generation"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/Commits.html" label="Commits"></topic> - <topic href="help/JGit/New_and_Noteworthy/0.9/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/JGit/New_and_Noteworthy/0.10/0.10.html" label="JGit 0.10 New and Noteworthy"> + <topic href="help/JGit/New_and_Noteworthy/0.10/0.10.html" label="Histogram Diff"></topic> + <topic href="help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html" label="HTTP basic and digest authentication"></topic> + <topic href="help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html" label="Performance: New IndexDiffFilter"></topic> + <topic href="help/JGit/New_and_Noteworthy/0.10/Git-Porcelain-API-Updates.html" label="Git Porcelain API Updates"></topic> + <topic href="help/JGit/New_and_Noteworthy/0.10/User-Guide.html" label="User Guide"></topic> + <topic href="help/JGit/New_and_Noteworthy/0.10/Bugs-Closed.html" label="Bugs Closed"></topic> + <topic href="help/JGit/New_and_Noteworthy/0.10/Commits.html" label="Commits"></topic> + <topic href="help/JGit/New_and_Noteworthy/0.10/Updating-This-Document.html" label="Updating This Document"></topic> </topic> <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Git for Eclipse Users"> <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Centralised version control systems"></topic> |
