Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.10 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10
Felipe Contreras
spec: add missing build dependency Otherwise: /usr/bin/perl Makefile.PL PREFIX='/opt/git' INSTALL_BASE='' Can't locate ExtUtils/MakeMaker.pm in @INC (@INC contains: ...) at Makefile.PL line 1. BEGIN failed--compilation aborted at Makefile.PL line 1. make[1]: *** [perl.mak] Error 2 make: *** [perl/perl.mak] Error 2 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.10-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10-rc4
Junio C Hamano
Merge branch 'pt/gitk' * pt/gitk: gitk: fix setting font display with new tabbed dialog layout. gitk: fix tabbed preferences construction when using tcl 8.4
Junio C Hamano
Sync with 1.7.9.6
Junio C Hamano
Git 1.7.9.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.9.6
Junio C Hamano
Merge branch 'jc/maint-merge-autoedit' into maint * jc/maint-merge-autoedit: merge: backport GIT_MERGE_AUTOEDIT support
Pat Thoyts
gitk: fix setting font display with new tabbed dialog layout. The changes to the dialog window tree broke the preview of the selected font on the button. This corrects that issue. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pat Thoyts
gitk: fix tabbed preferences construction when using tcl 8.4 In 8.5 the incr command creates the target variable if it does not exist but in 8.4 using incr on a non-existing variable raises an error. Ensure we have created our counter variable when creating the tabbed dialog for non-themed preferences. Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@po…
Junio C Hamano
Merge git://github.com/git-l10n/git-po Portuguese Portuguese translations from Marco Sousa via Jiang Xin * 'master' of git://github.com/git-l10n/git-po: l10n: Add the Dutch translation team and initialize nl.po l10n: Inital Portuguese Portugal language (pt_PT) l10n: Improve zh_CN translation for Git 1.7.10-rc3
Vincent van Ravesteijn
l10n: Add the Dutch translation team and initialize nl.po Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Marco Sousa
l10n: Inital Portuguese Portugal language (pt_PT) Signed-off-by: Marco Sousa <marcomsousa@gmail.com>
Junio C Hamano
Merge branch 'maint' * maint: string-list: document that string_list_insert() inserts unique strings
Heiko Voigt
string-list: document that string_list_insert() inserts unique strings Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin
l10n: Improve zh_CN translation for Git 1.7.10-rc3 Improvements of zh_CN translations: - Update translation for msg "Changes not staged for commit:". - Remove unnecessary leading spaces for some messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
René Scharfe
config: remove useless assignment v1.7.9-8-g270a344 (config: stop using config_exclusive_filename) replaced config_exclusive_filename with given_config_file. In one case this resulted in a self-assignment, which is reported by clang as a warning. Remove the useless code. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.10-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10-rc3
Jim Meyering
correct a few doubled-word nits in comments and documentation Found by running this command: $ git ls-files -z|xargs -0 perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \ -e ' {' \ -e ' $n = ($` =~ tr/\n/\n/ + 1);' \ -e ' ($v = $&) =~ s/\n/\\n/g;' \ -e ' print "$ARGV:$n:$v\n";' \ -e ' }' Why not just git grep -E ...? That wouldn't work then the doubled words are separated by a newline. This is derived …
Jim Meyering
correct spelling: an URL -> a URL Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
l10n updates for Git 1.7.10-rc1 * 'master' of git://github.com/git-l10n/git-po: Add url of Swedish l10n team in TEAMS file l10n: Review zh_CN translation for Git 1.7.10-rc1 Update Swedish translation (724t0f0u). l10n: Update zh_CN translation for Git 1.7.10-rc1 l10n: Update git.pot (1 new message)
Zbigniew Jędrzejewski-Szmek
tests: unset COLUMNS inherited from environment $COLUMNS must be unset to not interfere with the tests. The tests already ignore the terminal size because output is redirected to a file, but COLUMNS overrides terminal size detection and changes the test output away from the standard 80. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin
Add url of Swedish l10n team in TEAMS file Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin
l10n: Review zh_CN translation for Git 1.7.10-rc1 Overall review of the zh_CN translation: - Distinguish the translations of index and stage, though they are the same thing. - Many other fixes, e.g., add the lost periods at the end of translated sentences. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Peter Krefting
Update Swedish translation (724t0f0u). - Update for 1.7.10-rc1. - Add a missing -e when generaring the "Untracked files" message. - Fixed some wordings after playing with the localized version.
Junio C Hamano
Update draft release notes to 1.7.10 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.7.9.5
Junio C Hamano
Git 1.7.9.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.9.5
Junio C Hamano
Merge branch 'jn/maint-fast-import-empty-ls' into maint * jn/maint-fast-import-empty-ls: fast-import: don't allow 'ls' of path with empty components fast-import: leakfix for 'ls' of dirty trees
Junio C Hamano
Merge branch 'ph/rerere-doc' into maint * ph/rerere-doc: rerere: Document 'rerere remaining'
Junio C Hamano
Merge branch 'ms/maint-config-error-at-eol-linecount' into maint * ms/maint-config-error-at-eol-linecount: config: report errors at the EOL with correct line number
  1. Prev
  2. Next