Permalink
Commits on Apr 3, 2012
  1. Git 1.7.10-rc4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 3, 2012
Commits on Apr 2, 2012
  1. Merge branch 'pt/gitk'

    * pt/gitk:
      gitk: fix setting font display with new tabbed dialog layout.
      gitk: fix tabbed preferences construction when using tcl 8.4
    gitster committed Apr 2, 2012
  2. Sync with 1.7.9.6

    gitster committed Apr 2, 2012
  3. Git 1.7.9.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 2, 2012
  4. Merge branch 'jc/maint-merge-autoedit' into maint

    * jc/maint-merge-autoedit:
      merge: backport GIT_MERGE_AUTOEDIT support
    gitster committed Apr 2, 2012
  5. gitk: fix setting font display with new tabbed dialog layout.

    The changes to the dialog window tree broke the preview of the selected
    font on the button. This corrects that issue.
    
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    patthoyts committed with gitster Apr 1, 2012
  6. gitk: fix tabbed preferences construction when using tcl 8.4

    In 8.5 the incr command creates the target variable if it does not exist
    but in 8.4 using incr on a non-existing variable raises an error. Ensure
    we have created our counter variable when creating the tabbed dialog for
    non-themed preferences.
    
    Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    patthoyts committed with gitster Apr 1, 2012
  7. Merge git://github.com/git-l10n/git-po

    Portuguese Portuguese translations from Marco Sousa via Jiang Xin
    
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: Add the Dutch translation team and initialize nl.po
      l10n: Inital Portuguese Portugal language (pt_PT)
      l10n: Improve zh_CN translation for Git 1.7.10-rc3
    gitster committed Apr 2, 2012
  8. l10n: Add the Dutch translation team and initialize nl.po

    Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
    vfr-nl committed Apr 2, 2012
  9. l10n: Inital Portuguese Portugal language (pt_PT)

    Signed-off-by: Marco Sousa <marcomsousa@gmail.com>
    marcomsousa committed with jiangxin Mar 31, 2012
Commits on Mar 31, 2012
  1. Merge branch 'maint'

    * maint:
      string-list: document that string_list_insert() inserts unique strings
    gitster committed Mar 31, 2012
Commits on Mar 30, 2012
  1. string-list: document that string_list_insert() inserts unique strings

    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Heiko Voigt committed with gitster Mar 29, 2012
  2. l10n: Improve zh_CN translation for Git 1.7.10-rc3

    Improvements of zh_CN translations:
    
     - Update translation for msg "Changes not staged for commit:".
     - Remove unnecessary leading spaces for some messages.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Mar 30, 2012
Commits on Mar 28, 2012
  1. config: remove useless assignment

    v1.7.9-8-g270a344 (config: stop using config_exclusive_filename) replaced
    config_exclusive_filename with given_config_file.  In one case this
    resulted in a self-assignment, which is reported by clang as a warning.
    Remove the useless code.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Mar 28, 2012
  2. Git 1.7.10-rc3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 28, 2012
  3. correct a few doubled-word nits in comments and documentation

    Found by running this command:
    $ git ls-files -z|xargs -0 perl -0777 -n \
     -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \
     -e '  {' \
     -e '    $n = ($` =~ tr/\n/\n/ + 1);' \
     -e '    ($v = $&) =~ s/\n/\\n/g;' \
     -e '    print "$ARGV:$n:$v\n";' \
     -e '  }'
    
    Why not just git grep -E ...?
    That wouldn't work then the doubled words are separated by a newline.
    This is derived from a Makefile syntax-check rule in gnulib's maint.mk:
      http://git.sv.gnu.org/cgit/gnulib.git/tree/top/maint.mk
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Mar 28, 2012
  4. correct spelling: an URL -> a URL

    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Mar 28, 2012
Commits on Mar 27, 2012
  1. l10n updates for Git 1.7.10-rc1

    * 'master' of git://github.com/git-l10n/git-po:
      Add url of Swedish l10n team in TEAMS file
      l10n: Review zh_CN translation for Git 1.7.10-rc1
      Update Swedish translation (724t0f0u).
      l10n: Update zh_CN translation for Git 1.7.10-rc1
      l10n: Update git.pot (1 new message)
    gitster committed Mar 27, 2012
  2. tests: unset COLUMNS inherited from environment

    $COLUMNS must be unset to not interfere with the tests. The tests
    already ignore the terminal size because output is redirected to a
    file, but COLUMNS overrides terminal size detection and changes the
    test output away from the standard 80.
    
    Reported-by: Jeff King <peff@peff.net>
    Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    keszybz committed with gitster Mar 27, 2012
  3. Add url of Swedish l10n team in TEAMS file

    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Mar 27, 2012
  4. l10n: Review zh_CN translation for Git 1.7.10-rc1

    Overall review of the zh_CN translation:
    
     - Distinguish the translations of index and stage, though they are the
       same thing.
    
     - Many other fixes, e.g., add the lost periods at the end of translated
       sentences.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Mar 27, 2012
  5. Update Swedish translation (724t0f0u).

    - Update for 1.7.10-rc1.
    - Add a missing -e when generaring the "Untracked files" message.
    - Fixed some wordings after playing with the localized version.
    nafmo committed with jiangxin Mar 15, 2012
Commits on Mar 26, 2012
  1. Update draft release notes to 1.7.10

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 26, 2012
  2. Sync with 1.7.9.5

    gitster committed Mar 26, 2012
  3. Git 1.7.9.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 26, 2012
  4. Merge branch 'jn/maint-fast-import-empty-ls' into maint

    * jn/maint-fast-import-empty-ls:
      fast-import: don't allow 'ls' of path with empty components
      fast-import: leakfix for 'ls' of dirty trees
    gitster committed Mar 26, 2012
  5. Merge branch 'ph/rerere-doc' into maint

    * ph/rerere-doc:
      rerere: Document 'rerere remaining'
    gitster committed Mar 26, 2012
  6. Merge branch 'ms/maint-config-error-at-eol-linecount' into maint

    * ms/maint-config-error-at-eol-linecount:
      config: report errors at the EOL with correct line number
    gitster committed Mar 26, 2012
  7. grep doc: add --break / --heading / -W to synopsis

    All of the other options were included in the synopsis, so it makes
    sense to include these as well.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MarkLodato committed with gitster Mar 26, 2012
  8. Documentation: improve description of GIT_EDITOR and preference order

    Previously GIT_EDITOR was not listed in git(1) "Environment Variables" section,
    which could be very confusing to users. Include it in "other" subsection along
    with a link to git-var(1), since that is the page that fully describes all
    places where editor can be set and also their preference order.
    
    Also, git-var(1) did not say that hardcoded fallback 'vi' may have been changed
    at build time. A user could be puzzled if 'nano' pops up even when none of the
    mentioned environment vars or config.editor are set. Clarify this.
    
    Ideally, the build system should be changed to reflect the chosen fallback
    editor when creating the man pages. Not sure if that is even possible though.
    
    Signed-off-by: Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MestreLion committed with gitster Mar 23, 2012
  9. documentation: fix alphabetic ordered list for git-rebase man page

    An alphabetic ordered list (a.) is converted to numerical in
    the man page (1.) so context comments naming 'a' were confusing,
    fix that by not using ordered list notation for 'a' anb 'b' items.
    
    Signed-off-by: Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nelson Benitez Leon committed with gitster Mar 23, 2012
Commits on Mar 24, 2012
  1. Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitk

    * git://ozlabs.org/~paulus/gitk:
      gitk: Teach gitk to respect log.showroot
      gitk: Add menu items for comparing a commit with the marked commit
      gitk: Speed up resolution of short SHA1 ids
      gitk: Use symbolic font names "sans" and "monospace" when available
      gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields
      gitk: Make "git describe" output clickable, too
      gitk: Fix the display of files when filtered by path
      gitk: Use a tabbed dialog to edit preferences
      gitk: Use "gitk: repo-top-level-dir" as window title
    gitster committed Mar 24, 2012
  2. gitk: Teach gitk to respect log.showroot

    In early days, all projects managed by git (except for git itself) had the
    product of a fairly mature development history in their first commit, and
    it was deemed unnecessary clutter to show additions of these thousands of
    paths as a patch.
    
    "git log" learned to show the patch for the initial commit without requiring
    --root command line option at 0f03ca9 (config option log.showroot to show
    the diff of root commits, 2006-11-23).
    
    Teach gitk to respect log.showroot.
    
    [paulus@samba.org: Cleaned up the Tcl a bit, use --bool on the
     git config call]
    
    Signed-off-by: Marcus Karlsson <mk@acc.umu.se>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    marcusk committed with paulusmack Oct 4, 2011
Commits on Mar 23, 2012
  1. Git 1.7.10-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 23, 2012
  2. .mailmap: unify various old mail addresses of gitster

    "git shortlog -s -e" should show a single current address with this.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 23, 2012