summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-04-14Merge branch 'sb/plug-streaming-leak'Libravatar Junio C Hamano1-1/+4
* sb/plug-streaming-leak: streaming.c: fix a memleak
2015-04-14Merge branch 'jn/doc-fast-import-no-16-octopus-limit'Libravatar Junio C Hamano1-4/+0
Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit
2015-04-14Merge branch 'sb/plug-wt-shortstatus-tracking-leak'Libravatar Junio C Hamano1-0/+1
* sb/plug-wt-shortstatus-tracking-leak: wt-status.c: fix a memleak
2015-04-14Merge branch 'pt/enter-repo-comment-fix'Libravatar Junio C Hamano1-8/+3
* pt/enter-repo-comment-fix: enter_repo(): fix docs to match code
2015-04-14Merge branch 'jz/gitweb-conf-doc-fix'Libravatar Junio C Hamano1-1/+1
* jz/gitweb-conf-doc-fix: gitweb.conf.txt: say "build-time", not "built-time"
2015-04-14Merge branch 'jk/cherry-pick-docfix'Libravatar Junio C Hamano1-1/+2
* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits
2015-04-14Merge branch 'iu/fix-parse-options-h-comment'Libravatar Junio C Hamano1-2/+1
* iu/fix-parse-options-h-comment: parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
2015-04-14Merge branch 'jg/cguide-we-cannot-count'Libravatar Junio C Hamano1-1/+1
* jg/cguide-we-cannot-count: CodingGuidelines: update 'rough' rule count
2015-04-14CodingGuidelines: update 'rough' rule countLibravatar Julian Gindi1-1/+1
Changed inaccurate count of "rough rules" from three to the more generic 'a few'. Signed-off-by: Julian Gindi <juliangindi@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-08Merge tag 'l10n-2.4.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano10-8098/+18704
git l10n 2.4.0-rnd2
2015-04-09Merge branch 'master' of git://github.com/alexhenrie/git-poLibravatar Jiang Xin1-236/+236
* 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation
2015-04-09l10n: TEAMS: Change repository URL of zh_CNLibravatar Jiang Xin1-1/+1
Repository URL of zh_CN l10n for Git has been changed over 2 years, update po/TEAMS for it. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-04-07l10n: ca.po: update translationLibravatar Alex Henrie1-236/+236
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-04-07l10n: Updated Bulgarian translation of git (2305t,0f,0u)Libravatar Alexander Shopov1-1436/+1456
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2015-04-07l10n: sv.po: Update Swedish translation (2305t0f0u)Libravatar Peter Krefting1-241/+244
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
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-31fast-import doc: remove suggested 16-parent limitLibravatar Jonathan Nieder1-4/+0
Merges with an absurd number of parents are still a bad idea because they do not render well in tools like gitk, but if they are present in the repository being imported into git then there's no need to avoid reproducing them faithfully. In olden times, before v1.6.0-rc0~194 (2008-06-27), git commit-tree and higher-level tools built on top of it were limited to writing 16 parents for a commit. Nowadays normal git operations are happy to write more parents when asked, so the motivation for this note in the fast-import documentation is gone and we can remove it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.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-31gitweb.conf.txt: say "build-time", not "built-time"Libravatar Jérôme Zago1-1/+1
"build-time" is used everywhere else. Signed-off-by: Jérôme Zago <git-patch@agt-the-walker.net> Reviewed-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-31streaming.c: fix a memleakLibravatar John Keeping1-1/+4
When stream_blob_to_fd() opens an input stream with a filter, the filter gets discarded upon calling close_istream() before the function returns in the normal case. However, when we fail to open the stream, we failed to discard the filter. By discarding the filter in the failure case, give a consistent life-time rule of the filter to the callers; otherwise the callers need to conditionally discard the filter themselves, and this function does not give enough hint for the caller to do so correctly. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-31enter_repo(): fix docs to match codeLibravatar Paul Tan1-8/+3
In b3256eb (standardize and improve lookup rules for external local repos), enter_repo() was modified to use a different precedence ordering of suffixes for DWIM of the repository path, and to ensure that the repository path is actually valid instead of just testing for existence. However, the documentation was not modified to reflect these changes. Fix the documentation to match the code. Documentation contributed by Jeff King. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-30wt-status.c: fix a memleakLibravatar Stefan Beller1-0/+1
wt_shortstatus_print_tracking() calls shorten_unambiguous_ref(), which returns a newly allocated memory the caller takes ownership of; it is necessary to free `base` when the function is done with it. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-30cherry-pick: fix docs describing handling of empty commitsLibravatar Jeff King1-1/+2
Commit b27cfb0 (git-cherry-pick: Add keep-redundant-commits option, 2012-04-20), added the --keep-redundant-commits option, and switched the default behavior (without that option) to silently ignore empty commits. Later, the second half of that commit was reverted in ac2b0e8 (cherry-pick: regression fix for empty commits, 2012-05-29), but the documentation added for --keep-redundant-commits was never updated to match. Let's do so now. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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-29parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defvalLibravatar Ivan Ukhov1-2/+1
When 20d1c652 (parse-options: remove unused OPT_SET_PTR, 2014-03-30) removed OPT_SET_PTR, the comment in the header that describes what the option did to defval field was left behind by mistake. Remove it. Signed-off-by: Ivan Ukhov <ivan.ukhov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-26 16:22:50 +0000