summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-04-05l10n: de.po: translate one messageLibravatar Ralf Thielow1-239/+248
Translate one message came from git.pot update in 6eebb35 (l10n: git.pot: v2.4.0 round 2 (1 update)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-04l10n: fr.po v2.4.0 round 2Libravatar Jean-Noel Avila1-255/+291
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-04-03l10n: ru: updated Russian translationLibravatar Dimitriy Ryazantcev1-238/+238
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2015-04-03l10n: vi.po(2305t): Updated 1 new stringLibravatar Tran Ngoc Quan1-244/+247
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-04-03l10n: zh_CN: for git v2.4.0 l10n round 2Libravatar Jiang Xin1-235/+235
Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-04-03l10n: git.pot: v2.4.0 round 2 (1 update)Libravatar Jiang Xin1-233/+233
Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-04-03Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin9-6348/+16883
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung' l10n: de.po: translate 99 new messages l10n: de.po: fix messages with abbreviated hashs l10n: de.po: add space before ellipsis l10n: vi.po: Updated Vietnamese translation l10n: zh_CN: translations for git v2.4.0-rc0 l10n: fr.po v2.4.0-rc0 round 1 l10n: ca.po: update translation l10n: ru: updated Russian translation l10n: sv.po: Update Swedish translation (2305t0f0u) l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed) l10n: ru: added Russian translation l10n: de.po: fix negation for commit -a with paths
2015-04-02Git 2.4.0-rc1Libravatar Junio C Hamano2-3/+4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-02Merge branch 'sb/atomic-push'Libravatar Junio C Hamano1-1/+1
* sb/atomic-push: send-pack: unify error messages for unsupported capabilities
2015-04-02send-pack: unify error messages for unsupported capabilitiesLibravatar Ralf Thielow1-1/+1
If --signed is not supported, the error message names the remote "receiving end". If --atomic is not supported, the error message names the remote "server". Unify the naming to "receiving end" as we're in the context of "push". Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-02l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'Libravatar Matthias Rüster1-9/+9
The use of 'symbolische Verknüpfung' for 'symbolic link' is more common than 'symbolischer Verweis'. Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-02l10n: de.po: translate 99 new messagesLibravatar Ralf Thielow1-851/+899
Translate 99 messages came from git.pot update in c2ea120 (l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-02l10n: de.po: fix messages with abbreviated hashsLibravatar Ralf Thielow1-2/+2
The three dots in messages where the hash is abbreviated were misinterpreted and are fixed with this commit. Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-02l10n: de.po: add space before ellipsisLibravatar Phillip Sz1-11/+11
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-03-31Sync with 2.3.5Libravatar Junio C Hamano3-2/+8
* maint: Git 2.3.5 docs: clarify what git-rebase's "-p" / "--preserve-merges" does
2015-03-31Git 2.3.5Libravatar Junio C Hamano3-2/+6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-31Merge branch 'ss/pull-rebase-preserve' into maintLibravatar Junio C Hamano2-4/+5
* ss/pull-rebase-preserve: docs: clarify what git-rebase's "-p" / "--preserve-merges" does docs: clarify "preserve" option wording for git-pull
2015-03-31Merge branch 'jc/report-path-error-to-dir' into maintLibravatar Junio C Hamano4-44/+44
Code clean-up. * jc/report-path-error-to-dir: report_path_error(): move to dir.c
2015-03-31Merge branch 'ph/push-doc-cas' into maintLibravatar Junio C Hamano1-8/+6
* ph/push-doc-cas: git-push.txt: clean up force-with-lease wording
2015-03-31l10n: vi.po: Updated Vietnamese translationLibravatar Tran Ngoc Quan1-866/+918
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-03-31l10n: zh_CN: translations for git v2.4.0-rc0Libravatar Jiang Xin1-1233/+887
Translate 99 updated messages (2305t0f0u) for git v2.4.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-03-31Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/gitLibravatar Jiang Xin1-890/+908
* 'fr-v2.4.0-rc0' of git://github.com/jnavila/git: l10n: fr.po v2.4.0-rc0 round 1
2015-03-30docs: clarify what git-rebase's "-p" / "--preserve-merges" doesLibravatar Sebastian Schuberth1-1/+3
Ignoring a merge can be read as ignoring the changes a merge commit introduces altogether, as if the entire side branch the merge commit merged was removed from the history. But that is not what happens if "-p" is not specified. What happens is that the individual commits a merge commit introduces are replayed in order, and only any possible merge conflict resolutions or manual amendments to the merge commit are ignored. Get this straight in the docs. Also, do not say that merge commits are *tried* to be recreated. As that is true almost everywhere it is better left unsaid. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-30l10n: fr.po v2.4.0-rc0 round 1Libravatar Jean-Noel Avila1-890/+908
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-03-28l10n: ca.po: update translationLibravatar Alex Henrie1-873/+912
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-03-28Sync with maintLibravatar Junio C Hamano2-1/+42
* maint: Prepare for 2.3.5 2.3.2 release notes: typofix
2015-03-28RelNotes: minor doc updatesLibravatar Junio C Hamano1-1/+3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-28Merge branch 'ph/push-doc-cas'Libravatar Junio C Hamano1-8/+6
* ph/push-doc-cas: git-push.txt: clean up force-with-lease wording
2015-03-28Merge branch 'ss/pull-rebase-preserve'Libravatar Junio C Hamano1-3/+2
* ss/pull-rebase-preserve: docs: clarify "preserve" option wording for git-pull
2015-03-28Prepare for 2.3.5Libravatar Junio C Hamano2-1/+42
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-28Merge branch 'sg/completion-gitcomp-nl-for-refs' into maintLibravatar Junio C Hamano1-2/+2
Code clean-up. * sg/completion-gitcomp-nl-for-refs: completion: use __gitcomp_nl() for completing refs
2015-03-28Merge branch 'jk/simplify-csum-file-sha1fd-check' into maintLibravatar Junio C Hamano1-7/+3
Code simplification. * jk/simplify-csum-file-sha1fd-check: sha1fd_check: die when we cannot open the file
2015-03-28Merge branch 'tg/test-index-v4' into maintLibravatar Junio C Hamano1-3/+12
A test fix. * tg/test-index-v4: t1700: make test pass with index-v4
2015-03-28Merge branch 'nd/doc-git-index-version' into maintLibravatar Junio C Hamano1-1/+2
Doc clean-up. * nd/doc-git-index-version: git.txt: list index versions in plain English
2015-03-28Merge branch 'ct/prompt-untracked-fix' into maintLibravatar Junio C Hamano2-1/+12
The prompt script (in contrib/) did not show the untracked sign when working in a subdirectory without any untracked files. * ct/prompt-untracked-fix: git prompt: use toplevel to find untracked files
2015-03-28Merge branch 'ws/grep-quiet-no-pager' into maintLibravatar Junio C Hamano1-1/+1
Even though "git grep --quiet" is run merely to ask for the exit status, we spawned the pager regardless. Stop doing that. * ws/grep-quiet-no-pager: grep: fix "--quiet" overwriting current output
2015-03-28Merge branch 'jc/submitting-patches-mention-send-email' into maintLibravatar Junio C Hamano1-0/+5
Recommend format-patch and send-email for those who want to submit patches to this project. * jc/submitting-patches-mention-send-email: SubmittingPatches: encourage users to use format-patch and send-email
2015-03-28Merge branch 'jk/cleanup-failed-clone' into maintLibravatar Junio C Hamano1-5/+6
An failure early in the "git clone" that started creating the working tree and repository could have resulted in some directories and files left without getting cleaned up. * jk/cleanup-failed-clone: clone: drop period from end of die_errno message clone: initialize atexit cleanup handler earlier
2015-03-28Merge branch 'jk/fetch-pack' into maintLibravatar Junio C Hamano3-13/+22
"git fetch" that fetches a commit using the allow-tip-sha1-in-want extension could have failed to fetch all the requested refs. * jk/fetch-pack: fetch-pack: remove dead assignment to ref->new_sha1 fetch_refs_via_pack: free extra copy of refs filter_ref: make a copy of extra "sought" entries filter_ref: avoid overwriting ref->old_sha1 with garbage
2015-03-28Merge branch 'tg/fix-check-order-with-split-index' into maintLibravatar Junio C Hamano1-19/+23
The split-index mode introduced at v2.3.0-rc0~41 was broken in the codepath to protect us against a broken reimplementation of Git that writes an invalid index with duplicated index entries, etc. * tg/fix-check-order-with-split-index: read-cache: fix reading of split index
2015-03-28Merge branch 'jk/prune-with-corrupt-refs' into maintLibravatar Junio C Hamano7-68/+147
"git prune" used to largely ignore broken refs when deciding which objects are still being used, which could spread an existing small damage and make it a larger one. * jk/prune-with-corrupt-refs: refs.c: drop curate_packed_refs repack: turn on "ref paranoia" when doing a destructive repack prune: turn on ref_paranoia flag refs: introduce a "ref paranoia" flag t5312: test object deletion code paths in a corrupted repository
2015-03-282.3.2 release notes: typofixLibravatar Thomas Ackermann1-1/+1
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-28Merge branch 'jn/doc-api-errors'Libravatar Junio C Hamano1-1/+1
* jn/doc-api-errors: api-error-handling doc: typofix
2015-03-28api-error-handling doc: typofixLibravatar Thomas Ackermann1-1/+1
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-27Sync with maintLibravatar Junio C Hamano1-0/+1
* maint: Update mailmap to spell out "Alexander Kuleshov"
2015-03-27Merge branch 'sb/leaks'Libravatar Junio C Hamano8-15/+27
* sb/leaks: http: release the memory of a http pack request as well read-cache: fix memleak add_to_index(): free unused cache-entry commit.c: fix a memory leak http-push: remove unneeded cleanup merge-recursive: fix memleaks merge-blobs.c: fix a memleak builtin/apply.c: fix a memleak update-index: fix a memleak read-cache: free cache entry in add_to_index in case of early return
2015-03-27Merge branch 'jk/tag-h-column-is-a-listing-option' into maintLibravatar Junio C Hamano1-2/+2
"git tag -h" used to show the "--column" and "--sort" options that are about listing in a wrong section. * jk/tag-h-column-is-a-listing-option: tag: fix some mis-organized options in "-h" listing
2015-03-27Merge branch 'jk/smart-http-hide-refs' into maintLibravatar Junio C Hamano2-6/+21
The transfer.hiderefs support did not quite work for smart-http transport. * jk/smart-http-hide-refs: upload-pack: do not check NULL return of lookup_unknown_object upload-pack: fix transfer.hiderefs over smart-http
2015-03-27Merge branch 'js/completion-ctags-pattern-substitution-fix' into maintLibravatar Junio C Hamano1-1/+1
The code that reads from the ctags file in the completion script (in contrib/) did not spell ${param/pattern/string} substitution correctly, which happened to work with bash but not with zsh. * js/completion-ctags-pattern-substitution-fix: contrib/completion: escape the forward slash in __git_match_ctag
2015-03-27Update mailmap to spell out "Alexander Kuleshov"Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 23:21:08 +0000