| blob | aaeb84f5fd49b300a54c413745702dd65f931f3a |
1 <?xml version="1.0" encoding="UTF-8"?>\r
2 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\r
3 \r
4 <article lang="en" id="GIT Howto Index">\r
5 <articleinfo>\r
6 <title>GIT Howto Index</title>\r
7 <indexterm>\r
8 <primary>GIT Howto Index</primary>\r
9 </indexterm>\r
10 </articleinfo>\r
11 <simpara>Here is a collection of mailing list postings made by various\r
12 people describing how they use git in their workflow.</simpara>\r
13 <itemizedlist>\r
14 <listitem>\r
15 <simpara>\r
16 <ulink url="howto/maintain-git.txt">maintain-git</ulink> by Junio C Hamano <<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>>\r
17 </simpara>\r
18 </listitem>\r
19 </itemizedlist>\r
20 <simpara>Imagine that git development is racing along as usual, when our friendly\r
21 neighborhood maintainer is struck down by a wayward bus. Out of the\r
22 hordes of suckers (loyal developers), you have been tricked (chosen) to\r
23 step up as the new maintainer. This howto will show you "how to" do it.</simpara>\r
24 <itemizedlist>\r
25 <listitem>\r
26 <simpara>\r
27 <ulink url="howto/rebase-from-internal-branch.txt">rebase-from-internal-branch</ulink> by Junio C Hamano <<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>>\r
28 </simpara>\r
29 </listitem>\r
30 </itemizedlist>\r
31 <simpara>In this article, JC talks about how he rebases the\r
32 public "pu" branch using the core GIT tools when he updates\r
33 the "master" branch, and how "rebase" works. Also discussed\r
34 is how this applies to individual developers who sends patches\r
35 upstream.</simpara>\r
36 <itemizedlist>\r
37 <listitem>\r
38 <simpara>\r
39 <ulink url="howto/rebuild-from-update-hook.txt">rebuild-from-update-hook</ulink> by Junio C Hamano <<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>>\r
40 </simpara>\r
41 </listitem>\r
42 </itemizedlist>\r
43 <simpara>In this how-to article, JC talks about how he\r
44 uses the post-update hook to automate git documentation page\r
45 shown at <ulink url="http://www.kernel.org/pub/software/scm/git/docs/">http://www.kernel.org/pub/software/scm/git/docs/</ulink>.</simpara>\r
46 <itemizedlist>\r
47 <listitem>\r
48 <simpara>\r
49 <ulink url="howto/recover-corrupted-blob-object.txt">recover-corrupted-blob-object</ulink> by Linus Torvalds <<ulink url="mailto:torvalds@linux-foundation.org">torvalds@linux-foundation.org</ulink>>\r
50 </simpara>\r
51 </listitem>\r
52 </itemizedlist>\r
53 <simpara>Some tricks to reconstruct blob objects in order to fix\r
54 a corrupted repository.</simpara>\r
55 <itemizedlist>\r
56 <listitem>\r
57 <simpara>\r
58 <ulink url="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge</ulink> by Linus Torvalds <<ulink url="mailto:torvalds@linux-foundation.org">torvalds@linux-foundation.org</ulink>>, Junio C Hamano <<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>>\r
59 </simpara>\r
60 </listitem>\r
61 </itemizedlist>\r
62 <simpara>Sometimes a branch that was already merged to the mainline\r
63 is later found to be faulty. Linus and Junio give guidance on\r
64 recovering from such a premature merge and continuing development\r
65 after the offending branch is fixed.</simpara>\r
66 <itemizedlist>\r
67 <listitem>\r
68 <simpara>\r
69 <ulink url="howto/revert-branch-rebase.html">revert-branch-rebase</ulink> by Junio C Hamano <<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>>\r
70 </simpara>\r
71 </listitem>\r
72 </itemizedlist>\r
73 <simpara>In this article, JC gives a small real-life example of using\r
74 <emphasis>git revert</emphasis> command, and using a temporary branch and tag for safety\r
75 and easier sanity checking.</simpara>\r
76 <itemizedlist>\r
77 <listitem>\r
78 <simpara>\r
79 <ulink url="howto/separating-topic-branches.txt">separating-topic-branches</ulink> by Junio C Hamano <<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>>\r
80 </simpara>\r
81 </listitem>\r
82 </itemizedlist>\r
83 <simpara>In this article, JC describes how to separate topic branches.</simpara>\r
84 <itemizedlist>\r
85 <listitem>\r
86 <simpara>\r
87 <ulink url="howto/setup-git-server-over-http.txt">setup-git-server-over-http</ulink> by Rutger Nijlunsing <<ulink url="mailto:rutger@nospam.com">rutger@nospam.com</ulink>>\r
88 </simpara>\r
89 </listitem>\r
90 <listitem>\r
91 <simpara>\r
92 <ulink url="howto/update-hook-example.txt">update-hook-example</ulink> by Junio C Hamano <<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>> and Carl Baldwin <<ulink url="mailto:cnb@fc.hp.com">cnb@fc.hp.com</ulink>>\r
93 </simpara>\r
94 </listitem>\r
95 </itemizedlist>\r
96 <simpara>An example hooks/update script is presented to\r
97 implement repository maintenance policies, such as who can push\r
98 into which branch and who can make a tag.</simpara>\r
99 <itemizedlist>\r
100 <listitem>\r
101 <simpara>\r
102 <ulink url="howto/use-git-daemon.txt">use-git-daemon</ulink>\r
103 </simpara>\r
104 </listitem>\r
105 <listitem>\r
106 <simpara>\r
107 <ulink url="howto/using-merge-subtree.html">using-merge-subtree</ulink> by Sean <<ulink url="mailto:seanlkml@sympatico.ca">seanlkml@sympatico.ca</ulink>>\r
108 </simpara>\r
109 </listitem>\r
110 </itemizedlist>\r
111 <simpara>In this article, Sean demonstrates how one can use the subtree merge\r
112 strategy.</simpara>\r
113 </article>\r