delta/git.git, branch rs/simplify-config-include github.com: git/git.git config: simplify git_config_include() 2014-09-02T17:56:43+00:00 René Scharfe l.s.r@web.de 2014-08-30T16:07:05+00:00 37007c3a87f3d78f533533f96a0d49bd0d520671 Instead of using skip_prefix() to check the first part of the string and then strcmp() to check the rest, simply use strcmp() to check the whole string. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Instead of using skip_prefix() to check the first part of the string
and then strcmp() to check the rest, simply use strcmp() to check the
whole string.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge git://github.com/git-l10n/git-po 2014-08-29T17:18:22+00:00 Junio C Hamano gitster@pobox.com 2014-08-29T17:18:22+00:00 96db324a73fdada6fbe7b63221986f8f18cc63b0 * git://github.com/git-l10n/git-po: po/TEAMS: add new members to German translation team l10n: de.po: translate 38 new messages 
* git://github.com/git-l10n/git-po:
  po/TEAMS: add new members to German translation team
  l10n: de.po: translate 38 new messages
po/TEAMS: add new members to German translation team 2014-08-29T05:08:17+00:00 Ralf Thielow ralf.thielow@gmail.com 2014-08-26T16:54:30+00:00 782ac539ea6fd069ede52917f047ffa9a81947e5 Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
l10n: de.po: translate 38 new messages 2014-08-29T05:07:59+00:00 Ralf Thielow ralf.thielow@gmail.com 2014-06-20T15:22:48+00:00 d35ea4dec69fd247c0b2bb02dd768abf4272d377 Translate 38 new messages came from git.pot update in fe05e19 (l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> 
Translate 38 new messages came from git.pot update in fe05e19
(l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Merge branch 'jk/diff-tree-t-fix' 2014-08-26T18:16:26+00:00 Junio C Hamano gitster@pobox.com 2014-08-26T18:16:26+00:00 4109c28e055dba27d73cefb956bea5e611f66ec0 Fix (rarely used) "git diff-tree -t" regression in 2.0. * jk/diff-tree-t-fix: intersect_paths: respect mode in git's tree-sort 
Fix (rarely used) "git diff-tree -t" regression in 2.0.

* jk/diff-tree-t-fix:
  intersect_paths: respect mode in git's tree-sort
Merge branch 'jk/pack-shallow-always-without-bitmap' 2014-08-26T18:16:25+00:00 Junio C Hamano gitster@pobox.com 2014-08-26T18:16:25+00:00 a3d54f9a1fa481727a849b8753fc9d1abafe6583 Reachability bitmaps do not work with shallow operations. Fixes regression in 2.0. * jk/pack-shallow-always-without-bitmap: pack-objects: turn off bitmaps when we see --shallow lines 
Reachability bitmaps do not work with shallow operations.
Fixes regression in 2.0.

* jk/pack-shallow-always-without-bitmap:
  pack-objects: turn off bitmaps when we see --shallow lines
Merge branch 'jk/fix-profile-feedback-build' 2014-08-26T18:16:25+00:00 Junio C Hamano gitster@pobox.com 2014-08-26T18:16:25+00:00 212d781c967317a05a704609ddf3ffc8a09f8590 Fix profile-feedback build broken in 2.1 for tarball releases. * jk/fix-profile-feedback-build: Makefile: make perf tests optional for profile build 
Fix profile-feedback build broken in 2.1 for tarball releases.

* jk/fix-profile-feedback-build:
  Makefile: make perf tests optional for profile build
Merge git://github.com/git-l10n/git-po 2014-08-25T22:12:58+00:00 Junio C Hamano gitster@pobox.com 2014-08-25T22:12:58+00:00 c285171dacb2e3fbcb644ad16b14b2cb1875947d * git://github.com/git-l10n/git-po: l10n: de.po: improve message when switching branches l10n: de.po: fix typo po/TEAMS: Add Catalan team l10n: Add Catalan translation l10n: fr.po (2257t) update for version 2.1.0 l10n: sv.po: Update Swedish translation (2257t0f0u) l10n: vi.po (2257t): Update translation l10n: Updated Bulgarian translation of git (2257t,0f,0u) l10n: zh_CN: translations for git v2.1.0-rc0 l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed) l10n: Updated Bulgarian translation of git (2247t,0f,0u) l10n: Updated Bulgarian translation of git (2228t,0f,0u) l10n: Fix more typos in the Swedish translations 
* git://github.com/git-l10n/git-po:
  l10n: de.po: improve message when switching branches
  l10n: de.po: fix typo
  po/TEAMS: Add Catalan team
  l10n: Add Catalan translation
  l10n: fr.po (2257t) update for version 2.1.0
  l10n: sv.po: Update Swedish translation (2257t0f0u)
  l10n: vi.po (2257t): Update translation
  l10n: Updated Bulgarian translation of git (2257t,0f,0u)
  l10n: zh_CN: translations for git v2.1.0-rc0
  l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)
  l10n: Updated Bulgarian translation of git (2247t,0f,0u)
  l10n: Updated Bulgarian translation of git (2228t,0f,0u)
  l10n: Fix more typos in the Swedish translations
l10n: de.po: improve message when switching branches 2014-08-23T17:17:38+00:00 Ralf Thielow ralf.thielow@gmail.com 2014-06-12T18:15:55+00:00 869951babc24fef5c5cd58f86baefc25b6ed3765 Suggested-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> 
Suggested-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
l10n: de.po: fix typo 2014-08-23T17:17:38+00:00 Ralf Thielow ralf.thielow@gmail.com 2014-06-11T16:10:45+00:00 795b9ff872bbcd4bae3a8c80eaee7f12557e6830 Reported-by: Hartmut Henkel Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> 
Reported-by: Hartmut Henkel
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>