git, branch v1.7.11.1Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v1.7.11.12012-06-21T21:43:59ZGit 1.7.11.12012-06-21T21:43:59ZJunio C Hamanogitster@pobox.com2012-06-21T20:16:46Zurn:sha1:0e64a95ae5824238cebdc921ed060efdef19620d
Signed-off-by: Junio C Hamano <gitster@pobox.com>
docs: always define git-relative-html-prefix attribute2012-06-21T06:35:08ZJeff Kingpeff@peff.net2012-06-21T06:24:10Zurn:sha1:60475183c0fe76eab2a12fdf840caa0a29217886
Commit fe77b41 introduced a new attribute to let the linkgit macro
create cross-directory HTML references from the technical/ and howto/
subdirectories back to the main documentation. We define that attribute
to "../" on the command-line when building inside those subdirectories,
and otherwise leave it unset under the assumption that it would default
to being blank. Instead, asciidoc omits the link entirely, leading to
broken documentation. Fix this by defining git-relative-html-prefix to
blank in asciidoc.conf (and an instance on the command-line, when
present, will override it).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-commit-tree(1): update synopsis2012-06-19T18:36:57ZJunio C Hamanogitster@pobox.com2012-06-19T18:36:57Zurn:sha1:d28436736a078a429213003a9472e8caeb86c286
Even with many new kinds of options, the command still takes the
single <tree> as the first argument.
Probably we would want to update the command to allow it to take
<tree>-ish at the end for consistency.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation: spelling fixes2012-06-19T18:35:19ZMiklos Vajnavmiklos@frugalware.org2012-06-19T17:56:09Zurn:sha1:b4ab1980da71344e5ebb65242f52d68b1a03c42d
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.7.112012-06-17T21:07:15ZJunio C Hamanogitster@pobox.com2012-06-17T21:07:15Zurn:sha1:0ce2e396ee9fb0fa07e8381b338e49859dbf03db
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 1.7.10.52012-06-17T21:05:53ZJunio C Hamanogitster@pobox.com2012-06-17T21:05:53Zurn:sha1:a890c998de36b8460267b42779bbe34bad9c36d7Git 1.7.10.52012-06-17T21:04:15ZJunio C Hamanogitster@pobox.com2012-06-17T21:04:15Zurn:sha1:785ee4960c3d334cbc2b17ab74d2cebdf1b4db64
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Do not autosquash in case of an implied interactive rebase2012-06-17T21:01:42ZVincent van Ravesteijnvfr@lyx.org2012-05-24T13:57:26Zurn:sha1:941cab3a78a3fd3d21ba3acb3f8da3407a692015
The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'js/maint-fast-export-mark-error' into maint2012-06-17T21:00:03ZJunio C Hamanogitster@pobox.com2012-06-17T21:00:03Zurn:sha1:ca4effd8bce5e0dfce7ce1425074475c8643b7f0
"git fast-export" did not give a readable error message when the same
mark erroneously appeared twice in the --import-marks input.
Merge git://github.com/git-l10n/git-po2012-06-15T22:01:16ZJunio C Hamanogitster@pobox.com2012-06-15T22:01:16Zurn:sha1:7dba3f73e9571963fa03549956879d15ca7ad2d3
Updated Italian translations.
* git://github.com/git-l10n/git-po:
l10n: it.po: translate 212 new messages