Commits

Author Commit Message Labels Comments Date
Thomas Rast
perf: load test-lib-functions from the correct directory Loading it in the subshells still referred to $TEST_DIRECTORY/.., which was only correct in preliminary versions of perf-lib.sh Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Xingcan LAN
l10n: Improve zh_CN translation for msg "not something we can merge" Signed-off-by: Thynson <lanxingcan@gmail.com>
Xingcan LAN
l10n: Improve zh_CN trans for msg that cannot fast-forward Signed-off-by: Thynson <lanxingcan@gmail.com>
Jiang Xin
l10n: Update zh_CN translation for 1.7.10-rc0 Translate 1 new message from Git 1.7.10-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Peter Krefting
Update Swedish translation (732t0f0u). This update includes a replay of some review fixes from the initial translation run in 2010, which I cannot find having committed anywhere. Add myself to the po/TEAMS file as well. Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Peter Krefting
po/sv.po: add Swedish translation Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> (cherry picked from commit 54ce07007c7988268d43619c580e81fbca09d37b)
Jiang Xin
l10n: Update git.pot (1 new message) Update file 'po/git.pot' to v1.7.10-rc0: * Add 1 new l10n string in the new generated "git.pot" file at line: 191 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin
Merge v1.7.10-rc0 for git l10n update
Junio C Hamano
Git 1.7.10-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10-rc0
Junio C Hamano
Merge branch 'jc/pickaxe-ignore-case' By Junio C Hamano (2) and Ramsay Jones (1) * jc/pickaxe-ignore-case: ctype.c: Fix a sparse warning pickaxe: allow -i to search in patch case-insensitively grep: use static trans-case table
Karsten Blees
fix deletion of .git/objects sub-directories in git-prune/repack Both git-prune and git-repack (and thus, git-gc) try to rmdir while holding a DIR* handle on the directory. This can leave dangling empty directories in the .git/objects on platforms where directory cannot be removed while they are open. First call closedir() and then rmdir(); that is more logical ordering. Reported-by: John Chen <john0312@gmail.com> Reported-by: Stefan Naewe <stefan.naewe@gmai…
Junio C Hamano
Merge branch 'jh/threadable-symlink-check' By Jared Hance * jh/threadable-symlink-check: Add threaded versions of functions in symlinks.c.
Junio C Hamano
Merge branch 'jc/maint-diff-patch-header' By Junio C Hamano * jc/maint-diff-patch-header: diff -p: squelch "diff --git" header for stat-dirty paths t4011: illustrate "diff-index -p" on stat-dirty paths t4011: modernise style
Junio C Hamano
Merge branch 'th/mergetools-deltawalker' By Tim Henigan * th/mergetools-deltawalker: mergetools: add a plug-in to support DeltaWalker
Junio C Hamano
Merge branch 'cn/pull-rebase-message' By Carlos Martín Nieto * cn/pull-rebase-message: Make git-{pull,rebase} message without tracking information friendlier
Junio C Hamano
Merge branch 'sl/modern-t0000' By Stefano Lattarini * sl/modern-t0000: t0000: modernise style
Junio C Hamano
Merge branch 'nl/http-proxy-auth' By Nelson Benitez Leon * nl/http-proxy-auth: http: support proxies that require authentication
Junio C Hamano
Merge branch 'tr/maint-bundle-boundary' By Thomas Rast * tr/maint-bundle-boundary: bundle: keep around names passed to add_pending_object() t5510: ensure we stay in the toplevel test dir t5510: refactor bundle->pack conversion
Junio C Hamano
Merge branch 'zj/diff-stat-dyncol' By Zbigniew Jędrzejewski-Szmek (8) and Junio C Hamano (1) * zj/diff-stat-dyncol: : This breaks tests. Perhaps it is not worth using the decimal-width stuff : for this series, at least initially. diff --stat: add config option to limit graph width diff --stat: enable limiting of the graph part diff --stat: add a test for output with COLUMNS=40 diff --stat: use a maximum of 5/8 for the f…
Junio C Hamano
Merge branch 'maint' By Thomas Rast * maint: t5704: fix nonportable sed/grep usages Document the --histogram diff option
Jakub Narębski
gitweb: Fix fixed string (non-regexp) project search Use $search_regexp, where regex metacharacters are quoted, for searching projects list, rather than $searchtext, which contains original search term. Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast
t5704: fix nonportable sed/grep usages OS X's sed and grep would complain with (respectively) sed: 1: "/^-/{p;q}": extra characters at the end of q command grep: Regular expression too big For sed, use an explicit ; to terminate the q command. For grep, spell the "40 hex digits" explicitly in the regex, which should be safe as other tests already use this and we haven't got breakage reports on OS X about them. Signed-off-by: Th…
Junio C Hamano
Merge branch 'maint-1.7.8' into maint By Thomas Rast * maint-1.7.8: Document the --histogram diff option
Junio C Hamano
Merge branch 'maint-1.7.7' into maint-1.7.8 By Thomas Rast * maint-1.7.7: Document the --histogram diff option
Thomas Rast
Document the --histogram diff option Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast
perf: compare diff algorithms 8c912ee (teach --histogram to diff, 2011-07-12) claimed histogram diff was faster than both Myers and patience. We have since incorporated a performance testing framework, so add a test that compares the various diff tasks performed in a real 'log -p' workload. This does indeed show that histogram diff slightly beats Myers, while patience is much slower than the others. Signed-off-by: Thomas Ra…
Vincent van Ravesteijn
Documentation/git-branch: add default for --contains Indicate that the commit parameter of --contains defaults to HEAD. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vincent van Ravesteijn
Documentation/git-branch: fix a typo Fix a typo by replacing 'tag' with 'branch'. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vincent van Ravesteijn
Documentation/git-branch: cleanups Most of the exact option strings to be typed by end users are already set in typewriter font by using `--option`, but a few places used '--option' to call for italics or with no quoting. Uniformly use `--option`. Also add a full-stop after a sentence that missed one. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.7.9.3
  1. Prev
  2. Next