1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Junio C Hamano
Git 1.7.11-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.7.10.4 * maint: Git 1.7.10.4
Junio C Hamano
Git 1.7.10.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10.4
Junio C Hamano
Merge branch 'ef/maint-rebase-error-message' into maint When "git rebase" was given a bad commit to replay the history on, its error message did not correctly give the command line argument it had trouble parsing. By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly
Junio C Hamano
Update draft release notes to 1.7.11 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ef/maint-rebase-error-message' By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly
Junio C Hamano
Merge branch 'nh/empty-rebase' * nh/empty-rebase: cherry-pick: regression fix for empty commits
Junio C Hamano
Merge branch 'vr/rebase-autosquash-does-not-imply-i' "git rebase -p" used to pay attention to rebase.autosquash which was wrong. "git rebase -p -i" should, but "git rebase -p" by itself should not. By Vincent van Ravesteijn * vr/rebase-autosquash-does-not-imply-i: Do not autosquash in case of an implied interactive rebase
Junio C Hamano
Merge branch 'mm/levenstein-penalize-deletion-less' "git tags" used to suggest "git stage" which was nonsense; it should have favored "git tag". Tweak the cost of deletion to correct it. By Matthieu Moy * mm/levenstein-penalize-deletion-less: Reduce cost of deletion in levenstein distance (4 -> 3)
Junio C Hamano
Merge branch 'jl/submodule-report-new-path-once' "git submodule init" used to report "registered for path ..." even for submodules that were registered earlier. By Jens Lehmann * jl/submodule-report-new-path-once: submodules: print "registered for path" message only once
Junio C Hamano
Sync with maint
Junio C Hamano
Start preparing for 1.7.10.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ef/http-o-depends-on-gvf' into maint A minor compilation fix. By Erik Faye-Lund * ef/http-o-depends-on-gvf: Makefile: add missing GIT-VERSION-FILE dependency
Junio C Hamano
Merge git://github.com/git-l10n/git-po By Jiang Xin (4) and others via Jiang Xin * git://github.com/git-l10n/git-po: l10n: Set nplurals of zh_CN.po from 1 to 2 l10n: zh_CN.po: translate 323 new messages l10n: zh.CN.po: update by msgmerge git.pot First release translation for Vietnamese Init translation for Vietnamese l10n: New it.po file with 504 translations Update Swedish translation (728t0f0u) l10n: Update git.pot (4…
Junio C Hamano
Merge branch 'rs/maint-grep-F' into maint "git grep -e '$pattern'", unlike the case where the patterns are read from a file, did not treat individual lines in the given pattern argument as separate regular expressions as it should. By René Scharfe * rs/maint-grep-F: grep: stop leaking line strings with -f grep: support newline separated pattern list grep: factor out do_append_grep_pat() grep: factor out create_grep_pat()
Junio C Hamano
Merge branch 'jk/ident-split-fix' into maint An author/committer name that is a single character was mishandled as an invalid name by mistake. By Jeff King * jk/ident-split-fix: fix off-by-one error in split_ident_line
Junio C Hamano
Merge branch 'jk/pretty-commit-header-incomplete-line' into maint By Jeff King * jk/pretty-commit-header-incomplete-line: avoid segfault when reading header of malformed commits
Junio C Hamano
Merge branch 'jk/format-person-part-buffer-limit' into maint By Jeff King * jk/format-person-part-buffer-limit: pretty: avoid buffer overflow in format_person_part
Junio C Hamano
Merge branch 'ap/checkout-no-progress-for-non-tty' into maint "git checkout" gave progress display even when the standard error stream was not connected to the tty, which made little sense. By Avery Pennarun * ap/checkout-no-progress-for-non-tty: checkout: no progress messages if !isatty(2).
Junio C Hamano
Merge branch 'maint' of git://github.com/git-l10n/git-po into maint By Peter Krefting via Peter Krefting * 'maint' of git://github.com/git-l10n/git-po: Update Swedish translation (728t0f0u)
Jiang Xin
i18n: apply: split to fix a partial i18n message The 4th arg of "new mode (%o) of %s does not match old mode (%o)%s%s" is blank string or string " of ". Even mark the string " of " for a complete i18n, this message is still hard to translate right. Split it into two slight different messages would make l10n teams happy. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin
l10n: Set nplurals of zh_CN.po from 1 to 2 In most cases, plural-forms are unnecessary for Chinese. For example, "apple" and "apples" are the same in Chinese, they are both translated as "苹果". While there are exceptions, e.g., the plural form of "he", "she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)", and "它(it)" have plural forms too, they are "他们", "她们", and "它们". But what makes 'nplurals=1' hard to work right for Chine…
Jiang Xin
l10n: zh_CN.po: translate 323 new messages Update Simplified Chinese translation for 134 fuzzy, 189 new messages from Git v1.7.10.2-548-g9de96. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Zhuang Ya <zhuangya@me.com>
kusma
Makefile: add missing GIT-VERSION-FILE dependency In 20fc9bc (Set HTTP user agent to git/GIT_VERSION, 2006-04-04), http.o started recording GIT_VERSION, but http.o wasn't added to the list of files that depends on GIT-VERSION-FILE. Fix this, so mofications to GIT-VERSION-FILE will result in an updated user-agent string. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin
l10n: zh.CN.po: update by msgmerge git.pot Update of zh_CN.po: 134 fuzzy translations, 189 untranslated messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Tran Ngoc Quan
First release translation for Vietnamese Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Tran Ngoc Quan
Init translation for Vietnamese Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
kusma
rebase: report invalid commit correctly In 9765b6a (rebase: align variable content, 2011-02-06), the code to error out was moved up one level. Unfortunately, one reference to a function parameter wasn't rewritten as it should, leading to the wrong parameter being errored on. This error was propagated by 71786f5 (rebase: factor out reference parsing, 2011-02-06) and merged in 78c6e0f (Merge branch 'mz/rebase', 2011-04-28). Correct this…
Jeff King
INSTALL: update asciidoc recommendation Since commit 6cf378f (docs: stop using asciidoc no-inline-literal), we no longer support asciidoc versions less than 8.4.1, which introduced inline literals. Note this in the INSTALL document. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Marco Paolone
l10n: New it.po file with 504 translations Signed-off-by: Marco Paolone <marcopaolone@gmail.com>
  1. Prev
  2. Next