Permalink
Commits on Feb 24, 2017
  1. Git 2.12

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 24, 2017
  2. Merge branch 'ps/doc-gc-aggressive-depth-update'

    Doc update.
    
    * ps/doc-gc-aggressive-depth-update:
      docs/git-gc: fix default value for `--aggressiveDepth`
    gitster committed Feb 24, 2017
  3. Merge branch 'bc/worktree-doc-fix-detached'

    Doc update.
    
    * bc/worktree-doc-fix-detached:
      Documentation: correctly spell git worktree --detach
    gitster committed Feb 24, 2017
  4. Merge branch 'dr/doc-check-ref-format-normalize'

    Doc update.
    
    * dr/doc-check-ref-format-normalize:
      git-check-ref-format: clarify documentation for --normalize
    gitster committed Feb 24, 2017
  5. Merge branch 'gp/document-dotfiles-in-templates-are-not-copied'

    Doc update.
    
    * gp/document-dotfiles-in-templates-are-not-copied:
      init: document dotfiles exclusion on template copy
    gitster committed Feb 24, 2017
  6. Merge branch 'rt/align-add-i-help-text'

    Doc update.
    
    * rt/align-add-i-help-text:
      git add -i: replace \t with blanks in the help message
    gitster committed Feb 24, 2017
  7. Merge branch 'bc/blame-doc-fix'

    Doc update.
    
    * bc/blame-doc-fix:
      Documentation: use brackets for optional arguments
    gitster committed Feb 24, 2017
  8. docs/git-gc: fix default value for `--aggressiveDepth`

    In commit 07e7dbf (gc: default aggressive depth to 50, 2016-08-11),
    the default aggressive depth of git-gc has been changed to 50. While
    git-config(1) has been updated to represent the new default value,
    git-gc(1) still mentions the old value. This patch fixes it.
    
    Signed-off-by: Patrick Steinhardt <ps@pks.im>
    Reviewed-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pks-t committed with gitster Feb 24, 2017
  9. Merge tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-po

    l10n-2.12.0-rnd2
    
    * tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits)
      l10n: zh_CN: for git v2.12.0 l10n round 2
      l10n: Update Catalan translation
      l10n: pt_PT: update Portuguese tranlation
      l10n: sv.po: Update Swedish translation (3139t0f0u)
      l10n: de.po: translate 241 messages
      l10n: ko.po: Update Korean translation
      l10n: vi.po (3139t): Updated 2 new messages for rc1
      l10n: fr.po: v2.12.0 round 2 3139t
      l10n: git.pot: v2.12.0 round 2 (2 new)
      l10n: vi.po: Updated Vietnamese translation (3137t)
      l10n: update Catalan translation
      l10n: sv.po: Update Swedish translation (3137t0f0u)
      l10n: fr.po: v2.11-rc0 first round
      l10n: ko.po: Update Korean translation
      l10n: fr.po: Fix a typo in the French translation
      l10n: fr.po: Remove gender specific adjectives
      l10n: fr.po: Fix typos
      l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)
      l10n: bg:  Updated Bulgarian translation (2913t+0f+0u)
      l10n: fixes to Catalan translation
      ...
    gitster committed Feb 24, 2017
  10. l10n: zh_CN: for git v2.12.0 l10n round 2

    Translate 241 messages (3139t0f0u) for git v2.12.0-rc1.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Jan 27, 2017
  11. l10n: Update Catalan translation

    Signed-off-by: Jordi Mas <jmas@softcatala.org>
    jordimas committed with jiangxin Feb 21, 2017
Commits on Feb 23, 2017
  1. l10n: pt_PT: update Portuguese tranlation

    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed Feb 5, 2017
Commits on Feb 22, 2017
  1. git add -i: replace \t with blanks in the help message

    Within the help message of 'git add -i', the 'diff' command uses one
    tab character and blanks to create the space between the name and the
    description while the others use blanks only.  So if the tab size is
    not at 4 characters, this description will not be in range.
    Replace the tab character with blanks.
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ralfth committed with gitster Feb 22, 2017
  2. Documentation: use brackets for optional arguments

    The documentation for git blame used vertical bars for optional
    arguments to -M and -C, which is unusual and potentially confusing.
    Since most man pages use brackets for optional items, and that's
    consistent with how we document the same options for git diff and
    friends, use brackets here, too.
    
    Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bk2204 committed with gitster Feb 22, 2017
  3. Documentation: correctly spell git worktree --detach

    The option is “--detach”, but we accidentally spelled it “--detached” at
    one point in the man page.
    
    Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
    Reported-by: Casey Rodarmor <casey@rodarmor.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bk2204 committed with gitster Feb 22, 2017
Commits on Feb 21, 2017
  1. git-check-ref-format: clarify documentation for --normalize

    Use of 'iff' may be confusing to people not familiar with this term.
    
    Improving the --normalize option's documentation to remove the use of
    'iff', and clearly describe what happens when the condition is not met.
    
    Signed-off-by: Damien Regad <dregad@mantisbt.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dregad committed with gitster Feb 19, 2017
  2. Merge branch 'master' of git://github.com/nafmo/git-l10n-sv

    * 'master' of git://github.com/nafmo/git-l10n-sv:
      l10n: sv.po: Update Swedish translation (3139t0f0u)
    jiangxin committed Feb 21, 2017
  3. Merge branch 'svn-escape-backslash' of git://bogomips.org/git-svn

    * 'svn-escape-backslash' of git://bogomips.org/git-svn:
      git-svn: escape backslashes in refnames
    gitster committed Feb 21, 2017
Commits on Feb 20, 2017
  1. l10n: sv.po: Update Swedish translation (3139t0f0u)

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    nafmo committed Feb 20, 2017
  2. l10n: de.po: translate 241 messages

    Translate 241 messages came from git.pot update in 673bfad
    (l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)) and a4d9483
    (l10n: git.pot: v2.12.0 round 2 (2 new)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Acked-by: Phillip Sz <phillip.szelat@gmail.com>
    ralfth committed Feb 20, 2017
Commits on Feb 19, 2017
  1. Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko

    * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko:
      l10n: ko.po: Update Korean translation
    jiangxin committed Feb 19, 2017
  2. Merge branch 'master' of https://github.com/vnwildman/git

    * 'master' of https://github.com/vnwildman/git:
      l10n: vi.po (3139t): Updated 2 new messages for rc1
    jiangxin committed Feb 19, 2017
  3. l10n: ko.po: Update Korean translation

    Signed-off-by: Changwoo Ryu <cwryu@debian.org>
    changwoo committed Feb 19, 2017
Commits on Feb 18, 2017
  1. l10n: vi.po (3139t): Updated 2 new messages for rc1

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Feb 18, 2017
Commits on Feb 17, 2017
  1. init: document dotfiles exclusion on template copy

    Not just . and .., but any path that begins with dot is not copied
    when copying the template directory to a new repository.  You can
    customize the template directory, copying some dotfiles might make
    sense, but it's actually a good thing not to, because you would not
    want to have your git directory copied in every git directory that
    is created should you decide to put your template directory under
    version control, for example.  Plus, it might be used as a feature
    by people who would want to exclude some files.
    
    Signed-off-by: Grégoire Paris <postmaster@greg0ire.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Grégoire Paris committed with gitster Feb 17, 2017
  2. l10n: fr.po: v2.12.0 round 2 3139t

    Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
    jnavila committed Feb 17, 2017
  3. Git 2.12-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 17, 2017
  4. l10n: git.pot: v2.12.0 round 2 (2 new)

    Generate po/git.pot from v2.12.0-rc1 for git v2.12.0 l10n round 2.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Feb 17, 2017
  5. Merge branch 'master' of git://github.com/git-l10n/git-po

    * 'master' of git://github.com/git-l10n/git-po:
      l10n: vi.po: Updated Vietnamese translation (3137t)
      l10n: update Catalan translation
      l10n: sv.po: Update Swedish translation (3137t0f0u)
      l10n: fr.po: v2.11-rc0 first round
      l10n: ko.po: Update Korean translation
      l10n: fr.po: Fix a typo in the French translation
      l10n: fr.po: Remove gender specific adjectives
      l10n: fr.po: Fix typos
      l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)
      l10n: bg:  Updated Bulgarian translation (2913t+0f+0u)
      l10n: fixes to Catalan translation
      l10n: zh_CN: review for git v2.11.0 l10n
      l10n: New Catalan translation maintainer
    jiangxin committed Feb 17, 2017
  6. Merge branch 'master' of https://github.com/vnwildman/git

    * 'master' of https://github.com/vnwildman/git:
      l10n: vi.po: Updated Vietnamese translation (3137t)
    jiangxin committed Feb 17, 2017
  7. Merge branch 'master' of https://github.com/Softcatala/git-po

    * 'master' of https://github.com/Softcatala/git-po:
      l10n: update Catalan translation
    jiangxin committed Feb 17, 2017
  8. l10n: vi.po: Updated Vietnamese translation (3137t)

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Feb 17, 2017
Commits on Feb 16, 2017
  1. Hopefully the final batch of mini-topics before the final

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 16, 2017
  2. Merge branch 'jk/tempfile-ferror-fclose-confusion'

    Code clean-up.
    
    * jk/tempfile-ferror-fclose-confusion:
      tempfile: avoid "ferror | fclose" trick
    gitster committed Feb 16, 2017
  3. Merge branch 'dp/submodule-doc-markup-fix'

    Doc fix.
    
    * dp/submodule-doc-markup-fix:
      config.txt: fix formatting of submodule.alternateErrorStrategy section
    gitster committed Feb 16, 2017