<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>fdedb422b53bd7e08db70ee41bd7ecc831d583c5</id>
      </parent>
    </parents>
    <author>
      <name>R. Tyler Ballance</name>
      <email>tyler@ccnet.dev.slide.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/4f9baf926acd8105c4d8b3a04cdf2412ce929b0f</url>
    <id>4f9baf926acd8105c4d8b3a04cdf2412ce929b0f</id>
    <committed-date>2008-12-08T23:58:22-08:00</committed-date>
    <authored-date>2008-12-08T23:58:22-08:00</authored-date>
    <message>Minor changes to force the version number</message>
    <tree>8ad0002835b26c7b3d0f1819aaa471c5676812ce</tree>
    <committer>
      <name>R. Tyler Ballance</name>
      <email>tyler@ccnet.dev.slide.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>48290d62f26f95ed2d4b784c415cc3ada1c1773a</id>
      </parent>
      <parent>
        <id>6db72d2f0b153af351154d632d880a82bd8d84bd</id>
      </parent>
    </parents>
    <author>
      <name>R. Tyler Ballance</name>
      <email>tyler@slide.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/fdedb422b53bd7e08db70ee41bd7ecc831d583c5</url>
    <id>fdedb422b53bd7e08db70ee41bd7ecc831d583c5</id>
    <committed-date>2008-12-08T23:31:38-08:00</committed-date>
    <authored-date>2008-12-08T23:31:38-08:00</authored-date>
    <message>Merge branch 'slide_v1.6.0.4' into slide_v1.6.0.5</message>
    <tree>108a0d13642482d0608d402a5fbc277776c26d4c</tree>
    <committer>
      <name>R. Tyler Ballance</name>
      <email>tyler@slide.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1c2ed59de2d14ad6ee9daa4d4f7254297d9a3830</id>
      </parent>
    </parents>
    <author>
      <name>R. Tyler Ballance</name>
      <email>tyler@slide.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/48290d62f26f95ed2d4b784c415cc3ada1c1773a</url>
    <id>48290d62f26f95ed2d4b784c415cc3ada1c1773a</id>
    <committed-date>2008-12-08T23:31:32-08:00</committed-date>
    <authored-date>2008-12-08T23:26:47-08:00</authored-date>
    <message>Apply the patch to solve this issue, courtesy of jast in irc.freenode.net#git

	xdev3 (master)% git pull . master-topfriends
	From .
	 * branch            master-topfriends -&gt; FETCH_HEAD
	git push orerror: failed to read delta base object 99b60fe040beed0189b03c33d1c750e864356b33 at offset 1376252850 from .git/objects/pack/pack-f7eb06e39f01b528c1d1a2c413ac51b31b8515aa.pack
	error: failed to read object 579269a0b9ab0694fc1add3c0a83e4329b514d15 at offset 1376253518 from .git/objects/pack/pack-f7eb06e39f01b528c1d1a2c413ac51b31b8515aa.pack
	fatal: object 579269a0b9ab0694fc1add3c0a83e4329b514d15 is corrupted
	Merge with strategy recursive failed.
	xdev3 (master)%

Signed-off-by: R. Tyler Ballance &lt;tyler@slide.com&gt;</message>
    <tree>34fcfc90beaeb169848ed5c83bcd68f56b982322</tree>
    <committer>
      <name>R. Tyler Ballance</name>
      <email>tyler@slide.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/1c2ed59de2d14ad6ee9daa4d4f7254297d9a3830</url>
    <id>1c2ed59de2d14ad6ee9daa4d4f7254297d9a3830</id>
    <committed-date>2008-12-07T15:11:54-08:00</committed-date>
    <authored-date>2008-12-07T03:03:16-08:00</authored-date>
    <message>GIT 1.6.0.5

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>ec05f0850e13f73a6a9cfb8cc7f1b36ff0f8b411</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>3927bbe9a4d4033551dea39ac1abb9cdc45d822c</id>
      </parent>
    </parents>
    <author>
      <name>Matt McCutchen</name>
      <email>matt@mattmccutchen.net</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5</url>
    <id>dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5</id>
    <committed-date>2008-12-07T14:57:57-08:00</committed-date>
    <authored-date>2008-10-10T18:56:15-07:00</authored-date>
    <message>&quot;git diff &lt;tree&gt;{3,}&quot;: do not reverse order of arguments

According to the message of commit 0fe7c1de16f71312e6adac4b85bddf0d62a47168,
&quot;git diff&quot; with three or more trees expects the merged tree first followed by
the parents, in order.  However, this command reversed the order of its
arguments, resulting in confusing diffs.  A comment /* Again, the revs are all
reverse */ suggested there was a reason for this, but I can't figure out the
reason, so I removed the reversal of the arguments.  Test case included.

Signed-off-by: Matt McCutchen &lt;matt@mattmccutchen.net&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;</message>
    <tree>8171a2c869f6b1ef3a8a849fab1af952874d77de</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bcc6a833032e0830195c1de1b834006a1d0156fe</id>
      </parent>
    </parents>
    <author>
      <name>Jeff King</name>
      <email>peff@peff.net</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/3927bbe9a4d4033551dea39ac1abb9cdc45d822c</url>
    <id>3927bbe9a4d4033551dea39ac1abb9cdc45d822c</id>
    <committed-date>2008-12-07T02:53:45-08:00</committed-date>
    <authored-date>2008-12-06T11:40:34-08:00</authored-date>
    <message>tag: delete TAG_EDITMSG only on successful tag

The user may put some effort into writing an annotated tag
message. When the tagging process later fails (which can
happen fairly easily, since it may be dependent on gpg being
correctly configured and used), there is no record left on
disk of the tag message.

Instead, let's keep the TAG_EDITMSG file around until we are
sure the tag has been created successfully. If we die
because of an error, the user can recover their text from
that file. Leaving the file in place causes no conflicts;
it will be silently overwritten by the next annotated tag
creation.

This matches the behavior of COMMIT_EDITMSG, which stays
around in case of error.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>9d8b8febf7e195e1cf76c704419c00b1b4e49da1</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e4a80ecf40c9651741def7c4f0b2ca56b42af1a8</id>
      </parent>
    </parents>
    <author>
      <name>Jakub Narebski</name>
      <email>jnareb@gmail.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/bcc6a833032e0830195c1de1b834006a1d0156fe</url>
    <id>bcc6a833032e0830195c1de1b834006a1d0156fe</id>
    <committed-date>2008-12-07T02:52:37-08:00</committed-date>
    <authored-date>2008-12-07T01:36:36-08:00</authored-date>
    <message>gitweb: Make project specific override for 'grep' feature work

The 'grep' feature was marked in the comments as having project
specific config, but it lacked 'sub' key required for it to work.

Kind-of-Noticed-by: Matt Kraai &lt;kraai@ftbfs.org&gt;
Signed-off-by: Jakub Narebski &lt;jnareb@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>13280146e44173b0b01a0d11b0021d4460d09d07</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d551bbaf3af1fad947c704bdeb9cf664b34e38c6</id>
      </parent>
    </parents>
    <author>
      <name>Miklos Vajna</name>
      <email>vmiklos@frugalware.org</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/e4a80ecf40c9651741def7c4f0b2ca56b42af1a8</url>
    <id>e4a80ecf40c9651741def7c4f0b2ca56b42af1a8</id>
    <committed-date>2008-12-07T02:41:55-08:00</committed-date>
    <authored-date>2008-12-06T16:45:37-08:00</authored-date>
    <message>http.c: use 'git_config_string' to get 'curl_http_proxy'

Signed-off-by: Miklos Vajna &lt;vmiklos@frugalware.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>6655cbd2e45a26c1d0bd0cd1f03deeb572b9d2f6</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2ab4de57ea2c423fe8abae5278507106972ef1fe</id>
      </parent>
    </parents>
    <author>
      <name>Thomas Rast</name>
      <email>trast@student.ethz.ch</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/d551bbaf3af1fad947c704bdeb9cf664b34e38c6</url>
    <id>d551bbaf3af1fad947c704bdeb9cf664b34e38c6</id>
    <committed-date>2008-12-07T02:41:45-08:00</committed-date>
    <authored-date>2008-12-06T12:50:09-08:00</authored-date>
    <message>fetch-pack: Avoid memcpy() with src==dst

memcpy() may only be used for disjoint memory areas, but when invoked
from cmd_fetch_pack(), we have my_args == &amp;args.  (The argument cannot
be removed entirely because transport.c invokes with its own
variable.)

Signed-off-by: Thomas Rast &lt;trast@student.ethz.ch&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>ed32d59e4e83df723e6b9fdd973608cf7de87d78</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>733070bea9ce28d557f0b0950acc05b3fe6ff6c6</id>
      </parent>
      <parent>
        <id>0b38227f283e208866d3e2ac85bcd947a71f1b17</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/2ab4de57ea2c423fe8abae5278507106972ef1fe</url>
    <id>2ab4de57ea2c423fe8abae5278507106972ef1fe</id>
    <committed-date>2008-12-02T23:47:25-08:00</committed-date>
    <authored-date>2008-12-02T23:47:25-08:00</authored-date>
    <message>Merge branch 'jk/maint-commit-v-strip' into maint

* jk/maint-commit-v-strip:
  commit: Fix stripping of patch in verbose mode.</message>
    <tree>9828a4bdbebae0e83ec9d509b4192d8cdf7276d9</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0fd9d7e66deb7071da2a568b96c94f94ee890908</id>
      </parent>
    </parents>
    <author>
      <name>Davide Libenzi</name>
      <email>davidel@xmailserver.org</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/733070bea9ce28d557f0b0950acc05b3fe6ff6c6</url>
    <id>733070bea9ce28d557f0b0950acc05b3fe6ff6c6</id>
    <committed-date>2008-12-02T23:45:37-08:00</committed-date>
    <authored-date>2008-11-07T21:24:33-08:00</authored-date>
    <message>xdiff: give up scanning similar lines early

In a corner case of large files whose lines do not match uniquely, the
loop to eliminate a line that matches multiple locations adjacent to a run
of lines that do not uniquely match wasted too much cycles.  Fix this by
giving up early after scanning 100 lines in both direction.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>4bfc97b38f65e30f28ac296a392d1cf85b36313a</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e23f6822df5ee0acfe244c819a419c3e7c8c9e7e</id>
      </parent>
      <parent>
        <id>83d0289df6fb4deae100ee3fc37b90683c2e8c9f</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/0fd9d7e66deb7071da2a568b96c94f94ee890908</url>
    <id>0fd9d7e66deb7071da2a568b96c94f94ee890908</id>
    <committed-date>2008-12-02T23:00:04-08:00</committed-date>
    <authored-date>2008-12-02T23:00:04-08:00</authored-date>
    <message>Merge branch 'bc/maint-keep-pack' into maint

* bc/maint-keep-pack:
  repack: only unpack-unreachable if we are deleting redundant packs
  t7700: test that 'repack -a' packs alternate packed objects
  pack-objects: extend --local to mean ignore non-local loose objects too
  sha1_file.c: split has_loose_object() into local and non-local counterparts
  t7700: demonstrate mishandling of loose objects in an alternate ODB
  builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
  repack: do not fall back to incremental repacking with [-a|-A]
  repack: don't repack local objects in packs with .keep file
  pack-objects: new option --honor-pack-keep
  packed_git: convert pack_local flag into a bitfield and add pack_keep
  t7700: demonstrate mishandling of objects in packs with a .keep file</message>
    <tree>e8af2cdc7eee0aaa92087e7e798aa8d1c0d6acf1</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>25e30fa08e687d584d9dd87d13acf84bb1e1858c</id>
      </parent>
      <parent>
        <id>632f70178784291bd2974e07fdcd2b8e8608f252</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/e23f6822df5ee0acfe244c819a419c3e7c8c9e7e</url>
    <id>e23f6822df5ee0acfe244c819a419c3e7c8c9e7e</id>
    <committed-date>2008-12-02T22:38:07-08:00</committed-date>
    <authored-date>2008-12-02T22:38:07-08:00</authored-date>
    <message>Merge branch 'js/mingw-rename-fix' into maint

* js/mingw-rename-fix:
  compat/mingw.c: Teach mingw_rename() to replace read-only files</message>
    <tree>2ca7f382b895c7f15c3d716e6be233d9c881ca80</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5359fde8a4df60f9a2898dcfd2b4fcda02df4708</id>
      </parent>
    </parents>
    <author>
      <name>Miklos Vajna</name>
      <email>vmiklos@frugalware.org</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/25e30fa08e687d584d9dd87d13acf84bb1e1858c</url>
    <id>25e30fa08e687d584d9dd87d13acf84bb1e1858c</id>
    <committed-date>2008-12-02T15:17:07-08:00</committed-date>
    <authored-date>2008-12-01T10:50:02-08:00</authored-date>
    <message>User's Manual: remove duplicated url at the end of Appendix B

Signed-off-by: Miklos Vajna &lt;vmiklos@frugalware.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>ecb56ca9ca36cfb2c0a1d089ba3850d97d8249ed</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>27f64962f1a573126c0e85cb7c83aa75b669ce07</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/5359fde8a4df60f9a2898dcfd2b4fcda02df4708</url>
    <id>5359fde8a4df60f9a2898dcfd2b4fcda02df4708</id>
    <committed-date>2008-11-30T18:33:20-08:00</committed-date>
    <authored-date>2008-11-30T18:33:20-08:00</authored-date>
    <message>Update draft release notes to 1.6.0.5

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>21f6951cf031d935eb425b5464f5d392b19ea760</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>270c35490a52a635dc0ed1b1911c6861c68a68ed</id>
      </parent>
      <parent>
        <id>e0e03a731b2d06f42e79a2ff156ef9bd0e5c6c02</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/27f64962f1a573126c0e85cb7c83aa75b669ce07</url>
    <id>27f64962f1a573126c0e85cb7c83aa75b669ce07</id>
    <committed-date>2008-11-30T18:18:50-08:00</committed-date>
    <authored-date>2008-11-30T18:18:50-08:00</authored-date>
    <message>Merge branch 'st/maint-tag' into maint

* st/maint-tag:
  tag: Add more tests about mixing incompatible modes and options
  tag: Check that options are only allowed in the appropriate mode</message>
    <tree>a2e2b9102116de0633a6e10902c95ad84f52d3f7</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>16d258332e35dad58c0b22cd4d5c0e63ebb25328</id>
      </parent>
      <parent>
        <id>18afe101eb2c2f68ba58085515f592148128fba3</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/270c35490a52a635dc0ed1b1911c6861c68a68ed</url>
    <id>270c35490a52a635dc0ed1b1911c6861c68a68ed</id>
    <committed-date>2008-11-30T18:18:11-08:00</committed-date>
    <authored-date>2008-11-30T18:18:11-08:00</authored-date>
    <message>Merge branch 'mk/maint-cg-push' into maint

* mk/maint-cg-push:
  git push: Interpret $GIT_DIR/branches in a Cogito compatible way</message>
    <tree>1d65d2c7c564e3f40a1307b0a89628952431614b</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>539eec48f0a101b45c5f150a2bbc067fd85bc96d</id>
      </parent>
    </parents>
    <author>
      <name>Nguy&#7877;n Th&#225;i Ng&#7885;c Duy</name>
      <email>pclouds@gmail.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/16d258332e35dad58c0b22cd4d5c0e63ebb25328</url>
    <id>16d258332e35dad58c0b22cd4d5c0e63ebb25328</id>
    <committed-date>2008-11-30T18:16:32-08:00</committed-date>
    <authored-date>2008-11-30T02:54:31-08:00</authored-date>
    <message>generate-cmdlist.sh: avoid selecting synopsis at wrong place

In &quot;common&quot; man pages there is luckily no &quot;NAME&quot; anywhere except at
beginning of documents. If there is another &quot;NAME&quot;, sed could
mis-select it and lead to common-cmds.h corruption. So better nail it
at beginning of line, which would reduce corruption chance.

Signed-off-by: Nguy&#7877;n Th&#225;i Ng&#7885;c Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>0d387bce358675d2e90b27287091100b915571ef</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>35243577ab460d0b97b97948928d47f71dc8e46a</id>
      </parent>
      <parent>
        <id>2075ffb58e3a2d46d9e7606010f7f943f2295376</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/539eec48f0a101b45c5f150a2bbc067fd85bc96d</url>
    <id>539eec48f0a101b45c5f150a2bbc067fd85bc96d</id>
    <committed-date>2008-11-27T19:23:27-08:00</committed-date>
    <authored-date>2008-11-27T19:23:27-08:00</authored-date>
    <message>Merge branch 'mv/fast-export' into maint

* mv/fast-export:
  fast-export: use an unsorted string list for extra_refs
  Add new testcase to show fast-export does not always exports all tags</message>
    <tree>bd7134cfb57be91b518be6cbaf21436c664cc993</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>65117abc040d95ef9877c3b14a24f4bc6aeaf4cb</id>
      </parent>
    </parents>
    <author>
      <name>Sam Vilain</name>
      <email>sam@vilain.net</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/35243577ab460d0b97b97948928d47f71dc8e46a</url>
    <id>35243577ab460d0b97b97948928d47f71dc8e46a</id>
    <committed-date>2008-11-27T19:11:21-08:00</committed-date>
    <authored-date>2008-11-13T23:19:34-08:00</authored-date>
    <message>sha1_file.c: resolve confusion EACCES vs EPERM

An earlier commit 916d081 (Nicer error messages in case saving an object
to db goes wrong, 2006-11-09) confused EACCES with EPERM, the latter of
which is an unlikely error from mkstemp().

Signed-off-by: Sam Vilain &lt;sam@vilain.net&gt;</message>
    <tree>e0438ebed6506debad7a9df55b7d10184aa4207f</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1510dbe380a24fdf303a3c0594752cfdc968cb12</id>
      </parent>
    </parents>
    <author>
      <name>Joey Hess</name>
      <email>joey@kitenet.net</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/65117abc040d95ef9877c3b14a24f4bc6aeaf4cb</url>
    <id>65117abc040d95ef9877c3b14a24f4bc6aeaf4cb</id>
    <committed-date>2008-11-27T18:48:53-08:00</committed-date>
    <authored-date>2008-11-20T10:56:28-08:00</authored-date>
    <message>sha1_file: avoid bogus &quot;file exists&quot; error message

This avoids the following misleading error message:

error: unable to create temporary sha1 filename ./objects/15: File exists

mkstemp can fail for many reasons, one of which, ENOENT, can occur if
the directory for the temp file doesn't exist. create_tmpfile tried to
handle this case by always trying to mkdir the directory, even if it
already existed. This caused errno to be clobbered, so one cannot tell
why mkstemp really failed, and it truncated the buffer to just the
directory name, resulting in the strange error message shown above.

Note that in both occasions that I've seen this failure, it has not been
due to a missing directory, or bad permissions, but some other, unknown
mkstemp failure mode that did not occur when I ran git again. This code
could perhaps be made more robust by retrying mkstemp, in case it was a
transient failure.

Signed-off-by: Joey Hess &lt;joey@kitenet.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>bcd3e9c86d1bbe25c17723c4fee8ba8959d7f430</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>c07838371b116251b6c4bc62a2ba64109baf74f1</id>
      </parent>
    </parents>
    <author>
      <name>Matt McCutchen</name>
      <email>matt@mattmccutchen.net</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/1510dbe380a24fdf303a3c0594752cfdc968cb12</url>
    <id>1510dbe380a24fdf303a3c0594752cfdc968cb12</id>
    <committed-date>2008-11-27T18:35:28-08:00</committed-date>
    <authored-date>2008-11-23T22:55:22-08:00</authored-date>
    <message>git checkout: don't warn about unborn branch if -f is already passed

I think it's unnecessary to warn that the checkout has been forced due to an
unborn current branch if -f has been explicitly passed.  For one project, I am
using git-new-workdir to create workdirs from a bare repository whose HEAD is
set to an unborn branch, and this warning started to irritate me.

Signed-off-by: Matt McCutchen &lt;matt@mattmccutchen.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>d0bda0c0087f1e437917fdd6b0d5cb9e54bad226</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>8d8163f377829d5f61f6053bd55fdcecaf360d4c</id>
      </parent>
    </parents>
    <author>
      <name>SZEDER G&#225;bor</name>
      <email>szeder@ira.uka.de</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/c07838371b116251b6c4bc62a2ba64109baf74f1</url>
    <id>c07838371b116251b6c4bc62a2ba64109baf74f1</id>
    <committed-date>2008-11-27T18:35:07-08:00</committed-date>
    <authored-date>2008-11-27T05:35:53-08:00</authored-date>
    <message>bash: offer refs instead of filenames for 'git revert'

The completion script for 'git revert' currently offers options and
filenames.  However, 'git revert' doesn't take any filenames from the
command line, but a single commit.  Therefore, it's more sane to offer
refs instead.

Signed-off-by: SZEDER G&#225;bor &lt;szeder@ira.uka.de&gt;
Acked-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>69818d6d234bdb7a3b944a849e52af03e7cbfcb9</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b21a226a42d609d4d39522e27423e8323f0db71d</id>
      </parent>
    </parents>
    <author>
      <name>SZEDER G&#225;bor</name>
      <email>szeder@ira.uka.de</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/8d8163f377829d5f61f6053bd55fdcecaf360d4c</url>
    <id>8d8163f377829d5f61f6053bd55fdcecaf360d4c</id>
    <committed-date>2008-11-27T18:29:53-08:00</committed-date>
    <authored-date>2008-11-27T05:35:38-08:00</authored-date>
    <message>bash: remove dashed command leftovers

Commit 5a625b07 (bash: remove fetch, push, pull dashed form leftovers,
2008-10-03) did that already, but there were still some git-cmd left
here and there.

Signed-off-by: SZEDER G&#225;bor &lt;szeder@ira.uka.de&gt;
Acked-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>cb191ff9e11c3c860fb218017e37ae999dbd7424</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a0178ae2cfd79a1da5d7ddfacadb1e41560bb464</id>
      </parent>
      <parent>
        <id>3d51c853df5730212f704a526340a5a059dffeda</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/b21a226a42d609d4d39522e27423e8323f0db71d</url>
    <id>b21a226a42d609d4d39522e27423e8323f0db71d</id>
    <committed-date>2008-11-27T13:18:25-08:00</committed-date>
    <authored-date>2008-11-27T13:18:25-08:00</authored-date>
    <message>Merge branch 'pw/maint-p4' into maint

* pw/maint-p4:
  git-p4: fix keyword-expansion regex</message>
    <tree>2ddefc838193c9ac4533e392aeec1998ff81fbb3</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0</id>
      </parent>
    </parents>
    <author>
      <name>Pete Wyckoff</name>
      <email>pw@padd.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/3d51c853df5730212f704a526340a5a059dffeda</url>
    <id>3d51c853df5730212f704a526340a5a059dffeda</id>
    <committed-date>2008-11-27T13:17:58-08:00</committed-date>
    <authored-date>2008-11-26T10:52:15-08:00</authored-date>
    <message>git-p4: fix keyword-expansion regex

This text:

     my $dir = $File::Find::dir;
     return if ($dir !~ m,$options-&gt;{dirpat}$,);

was improperly converted to:

     my $dir = $File$dir !~ m,$options-&gt;{dirpat}$,);

by the keyword identifier expansion code.  Add a \n
to make sure the regex doesn't go across end-of-line
boundaries.

Signed-off-by: Pete Wyckoff &lt;pw@padd.com&gt;
Acked-by: Simon Hausmann &lt;simon@lst.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>eb16f8ba2ef52cf549bdf5a9f132418e8400b864</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0</id>
      </parent>
    </parents>
    <author>
      <name>Ralf Wildenhues</name>
      <email>Ralf.Wildenhues@gmx.de</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/a0178ae2cfd79a1da5d7ddfacadb1e41560bb464</url>
    <id>a0178ae2cfd79a1da5d7ddfacadb1e41560bb464</id>
    <committed-date>2008-11-27T01:00:45-08:00</committed-date>
    <authored-date>2008-11-26T23:32:01-08:00</authored-date>
    <message>Fix typos in the documentation.

Signed-off-by: Ralf Wildenhues &lt;Ralf.Wildenhues@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>23be99925e0eea2a650b1ccccfaeef33176d5b3a</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>61af494ca4e63cdc484ea091617ab5f3974f2f9c</id>
      </parent>
      <parent>
        <id>b0f34c3d6719903e280545e73ae89f6c2ebe533f</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0</url>
    <id>5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0</id>
    <committed-date>2008-11-26T11:57:15-08:00</committed-date>
    <authored-date>2008-11-26T11:57:15-08:00</authored-date>
    <message>Merge branch 'mm/maint-sort-config-doc' into maint

* mm/maint-sort-config-doc:
  config.txt: alphabetize configuration sections</message>
    <tree>c2f397eadef67364cea23daa81cc6cfd81de7cb3</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>37a7744ffe31af785571858f7341d588a6c66784</id>
      </parent>
    </parents>
    <author>
      <name>Matt McCutchen</name>
      <email>matt@mattmccutchen.net</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/b0f34c3d6719903e280545e73ae89f6c2ebe533f</url>
    <id>b0f34c3d6719903e280545e73ae89f6c2ebe533f</id>
    <committed-date>2008-11-26T11:07:57-08:00</committed-date>
    <authored-date>2008-11-26T00:26:50-08:00</authored-date>
    <message>config.txt: alphabetize configuration sections

I figured the sections might as well be in some order, so I chose alphabetical
but with &quot;core&quot; at the beginning.  This should help people add new variables
in the right places.

Signed-off-by: Matt McCutchen &lt;matt@mattmccutchen.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>c357f85cdbe66f4745430ecc6e250421f74f028d</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>37a7744ffe31af785571858f7341d588a6c66784</id>
      </parent>
    </parents>
    <author>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </author>
    <url>http://github.com/rtyler/slide-git/commit/61af494ca4e63cdc484ea091617ab5f3974f2f9c</url>
    <id>61af494ca4e63cdc484ea091617ab5f3974f2f9c</id>
    <committed-date>2008-11-26T09:58:41-08:00</committed-date>
    <authored-date>2008-11-26T09:58:41-08:00</authored-date>
    <message>Teach &quot;git diff&quot; to honour --[no-]ext-diff

The original intention of 72909be (Add diff-option --ext-diff, 2007-06-30)
was to optionally allow the use of external diff viewer in &quot;git log&quot;
family (while keeping them disabled by default).  It exposed the &quot;allow
external diff&quot; bit to the UI, but forgot to adjust the &quot;git diff&quot; codepath
that was set up to always allow use of the external diff viewer.

Noticed by Nazri Ramliy; tests by Ren&#233; Scharfe squashed in.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;</message>
    <tree>5c8b00bf07ef002926f667852c5e48ef6bb3f6df</tree>
    <committer>
      <name>Junio C Hamano</name>
      <email>gitster@pobox.com</email>
    </committer>
  </commit>
</commits>
