Permalink
Commits on Mar 28, 2012
  1. Git 1.7.10-rc3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 28, 2012
  2. 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
  3. 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
  3. Merge branch 'am/completion-zsh-fix'

    * am/completion-zsh-fix:
      contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
    gitster committed Mar 23, 2012
  4. Merge branch 'dw/gitweb-doc-grammo'

    Typofix.
    
    * dw/gitweb-doc-grammo:
      Documentation/gitweb: trivial English fixes
    gitster committed Mar 23, 2012
  5. Documentation/gitweb: trivial English fixes

    Change "it's" to "its" where a possessive is intended.  Also add two
    missing "the" that were noticed by Ben Walton.
    
    Signed-off-by: David Waitzman <djw@bbn.com>
    D Waitzman committed with gitster Mar 23, 2012
  6. gitk: Add menu items for comparing a commit with the marked commit

    Sometimes one wants to see the different between two commits that are
    a long distance apart in the graph display.  This is difficult to do
    with the "Diff this -> selected" and "Diff selected -> this" menu
    items because the need to maintain the selection means that one can't
    use the find facilities or the reference list window to navigate from
    one to the other.
    
    This provides an alternative using the mark.  Having found one commit,
    one marks it with the "Mark this commit" menu item, then navigates to
    the other commit and uses the new "Diff this -> marked commit" and/or
    "Diff marked commit -> this" menu items.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    paulusmack committed Mar 23, 2012
Commits on Mar 21, 2012
  1. contrib/completion: "local var=()" is misinterpreted as func-decl by zsh

    Certain versions of zsh seems to treat
    
        local var=()
    
    as a function declaration, rather than an assignment of an empty array,
    although its documentation does not suggest that this should be the case.
    
    With zsh 4.3.15 on Fedora Core 15, this causes
    
      __git_ps1 " (%s)"
    
    to trigger an error message:
    
      local:2: command not found: svn_url_pattern
    
    when GIT_PS1_SHOWUPSTREAM="auto".
    
    Signed-off-by: Alex Merry <dev@randomguy3.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    randomguy3 committed with gitster Sep 1, 2011
Commits on Mar 20, 2012
  1. Merge branch 'maint'

    * maint:
    gitster committed Mar 20, 2012
  2. Merge branch 'maint-1.7.8' into maint

    * maint-1.7.8:
      t/Makefile: Use $(sort ...) explicitly where needed
      gitweb: Fix actionless dispatch for non-existent objects
      i18n of multi-line advice messages
    gitster committed Mar 20, 2012
  3. Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8

    * ks/sort-wildcard-in-makefile:
      t/Makefile: Use $(sort ...) explicitly where needed
    gitster committed Mar 20, 2012
  4. Merge branch 'jc/advise-i18n' into maint-1.7.8

    * jc/advise-i18n:
      i18n of multi-line advice messages
    gitster committed Mar 20, 2012
  5. Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8

    * jn/gitweb-unspecified-action:
      gitweb: Fix actionless dispatch for non-existent objects
    gitster committed Mar 20, 2012
Commits on Mar 19, 2012
  1. gitk: Speed up resolution of short SHA1 ids

    On large repositories such as the Linux kernel, it can take quite a
    noticeable time (several seconds) for gitk to resolve short SHA1 IDs
    to their long form.  This speeds up the process by maintaining lists
    of IDs indexed by the first 4 characters of the SHA1 ID, speeding up
    the search by a factor of 65536 on large repositories.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    paulusmack committed Mar 19, 2012
Commits on Mar 18, 2012
  1. gitk: Use symbolic font names "sans" and "monospace" when available

    The following only concerns systems using X and the client-side font
    rendering framework from freedesktop.org.  Windows and Mac OS X are
    not affected.
    
    Starting with version 8.5, Tk uses freetype and fontconfig by default
    to render fonts on platforms that support it.  Gitk currently defaults
    to the font Helvetica for the interface and Courier for diffs, and
    both unfortunately look rather bad on screen in the default
    configuration on many Linux distros with anti-aliasing and poor
    hinting.
    
    It is better to default to "sans" and "monospace", which are mapped by
    fontconfig to some appropriate font of the sysadmin and user's
    choosing (typically Bitstream Vera Sans and Mono).  The result looks
    more sensible and it makes gitk feel like a well-behaved software
    citizen since its fonts match other native apps.
    
    This patch does not change the appearance of gitk for users that have
    already run it, since gitk uses the remembered UI and diff font names
    from ~/.gitk.
    
    Requested-by: Michael Biebl <biebl@debian.org>
    Reviewed-by: Josh Triplett <josh@joshtriplett.org>
    Acked-by: Mark Hills <mark@pogo.org.uk>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    jrn committed with paulusmack Mar 8, 2012
  2. gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields

    This prevents a search for a number like "105" on "All Fields" from
    matching against the raw author and commit timestamps.  These
    timestamps were already not searchable by themselves, and the
    displayed format does not match the query string anyway.
    
    Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    fbriere committed with paulusmack Mar 14, 2010
  3. gitk: Make "git describe" output clickable, too

    Automake's contribution guidelines suggest using "git describe" output
    in commit logs to reference previous commits.  By contrast, in
    coreutils, I had acquired the habit of using a bare SHA1 prefix (8 hex
    digits), since gitk creates clickable links for that, and not for "git
    describe" output.
    
    I prefer the readability of the full "git describe" output, yet want
    to retain the gitk links, so this renders as clickable not just
    SHA1-like strings, but also an SHA1-like string that is prefixed by
    "-g".
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    meyering committed with paulusmack Dec 10, 2011