Re: Update git-gui tree please?

From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Mar 26, 2011, 10:46 UTC
Message-ID: <87hbaqqhvr.fsf@fox.patthoyts.tk>
In-Reply-To: <7vlj06gziu.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Show 16 quoted lines

>As Sebastian's addition of BeyondCompare-3 as a new backend for mergetool
>has graduated to my 'master' branch, could you fetch from me and merge the
>tip of ss/git-gui-mergetool branch to git-gui repository, like this?
>
>	git fetch git://git.kernel.org/pub/scm/git/git.git next
>	git branch ss/git-gui-mergetool f3768a6714e667205d68475
>        git merge ss/git-gui-mergetool
>
>Also I'll hopefully tagging 1.7.5-rc0 by the end of the month or the
>middle of April at the latest, so please start planning to wrap up the
>enhancements and fixes meant for the next release and throw me a pull
>request when your tree is in a good shape to do so.  I realize that I am
>already behind your tip 4c2519e (git-gui: fetch/prune all entry appears
>last, 2011-02-22), but I'll wait until I hear from you.
>
>Thanks.

I have merged your ss/git-gui-mergetool branch in and tagged it so please pull:

The following changes since commit 8f85599aba6b569de5c559994704a416f52bc031:

  git-gui: apply color information from git diff output (2010-10-27 23:47:28 +0100)

are available in the git repository at:
  git://repo.or.cz/git-gui.git maint

Alex Riesen (2):
      git-gui: update russian translation
      git-gui: update russian translation

Alexandre Erwin Ittner (1):
      git-gui: add Brazilian Portuguese (pt-BR) translation

Bert Wesarg (16):
      git-gui: fix ANSI-color parsing
      git-gui: respect conflict marker size
      git-gui: fix browsers [Up To Parent] in sub-sub-directories.
      git-gui: Fix use of renamed tag.
      git-gui: Fix use of hunk tag for non-hunk content.
      git-gui: fix typo in image data
      git-gui: remove 'no such variable' for s error when encounter unknown file states
      git-gui: learn more type change states
      git-gui: rework handling of diff header
      git-gui: handle index lines only in the diff header
      git-gui: name also new symlinks so
      git-gui: there is no "mode *" diff header line
      git-gui: move 3way diff autodetect up
      git-gui: always reset the current tag
      git-gui: handle special content lines only in the diff header section
      git-gui: handle meta diff header lines only in the header section

Heiko Voigt (9):
      git gui: keep selected branch when remote is changed in push dialog
      git-gui: scroll down to default selection for push dialog
      git-gui: instead of defaulting to home directory use working directory
      git-gui: fix deleting item from all_remotes variable
      git-gui: always default to the last merged branch in remote delete
      git-gui: refactor remote submenu creation into subroutine
      git-gui: teach fetch/prune menu to do it for all remotes
      git-gui: fetch/prune all entry only for more than one entry
      git-gui: fetch/prune all entry appears last

Pat Thoyts (3):
      git-gui: Include version check and test for tearoff menu entry
      git-gui: detect the use of MUI langauge packs on Windows
      Merge branch 'ss/git-gui-mergetool'

Sebastian Schuberth (2):
      mergetool--lib: Sort tools alphabetically for easier lookup
      mergetool--lib: Add Beyond Compare 3 as a tool

Serge Ziryukin (1):
      git-gui: fix russian translation typos

Skip (1):
      git-gui: spelling fixes in russian translation

Stefan Naewe (1):
      git-gui: use --exclude-standard to check for untracked files

 git-gui.sh                   |   61 +-
 lib/browser.tcl              |    2 +-
 lib/choose_repository.tcl    |   14 +-
 lib/commit.tcl               |    9 +-
 lib/diff.tcl                 |  115 ++-
 lib/index.tcl                |   10 +-
 lib/merge.tcl                |    2 +
 lib/mergetool.tcl            |  101 +-
 lib/remote.tcl               |   91 ++-
 lib/remote_branch_delete.tcl |    9 +-
 lib/transport.tcl            |   34 +-
 po/glossary/pt_br.po         |  169 +++
 po/pt_br.po                  | 2568 ++++++++++++++++++++++++++++++++++++++++++
 po/ru.po                     |  623 ++++++-----
 14 files changed, 3371 insertions(+), 437 deletions(-)
 create mode 100644 po/glossary/pt_br.po
 create mode 100644 po/pt_br.po