Changes 1.7.10:

* various "gitk" updates.
  - show the path to the top level directory in the window title
  - update preference edit dialog
  - display file list correctly when directories are given on command line
  - make "git-describe" output in the log message into a clickable link
  - avoid matching the UNIX timestamp part when searching all fields
  - give preference to symbolic font names like sans & monospace
  - allow comparing two commits using a mark
  - "gitk" honors log.showroot configuration.
* Teams for localizing the messages from the Porcelain layer of
  commands are starting to form, thanks to Jiang Xin who volunteered
  to be the localization coordinator.  Translated messages for
  simplified Chinese, Swedish and Portuguese are available.
* The configuration mechanism learned an "include" facility; an
  assignment to the include.path pseudo-variable causes the named
  file to be included in-place when Git looks up configuration
  variables.
* A content filter (clean/smudge) used to be just a way to make the
  recorded contents "more useful", and allowed to fail; a filter can
  now optionally be marked as "required".
* Options whose names begin with "--no-" (e.g. the "--no-verify"
  option of the "git commit" command) can be negated by omitting
  "no-" from its name, e.g. "git commit --verify".
* "git am" learned to pass "-b" option to underlying "git mailinfo", so
  that a bracketed string other than "PATCH" at the beginning can be kept.
* "git clone" learned "--single-branch" option to limit cloning to a
  single branch (surprise!); tags that do not point into the history
  of the branch are not fetched.
* "git clone" learned to detach the HEAD in the resulting repository
  when the user specifies a tag with "--branch" (e.g., "--branch=v1.0").
  Clone also learned to print the usual "detached HEAD" advice in such
  a case, similar to "git checkout v1.0".
* When showing a patch while ignoring whitespace changes, the context
  lines are taken from the postimage, in order to make it easier to
  view the output.
More...

4 files changed, 13 insertions, 10 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index dce7f8f3cc6..48a0453c1b9 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2012/04/08 05:31:07 dholland Exp $
+# $NetBSD: Makefile,v 1.44 2012/04/13 20:43:24 adam Exp $
 
 .include "../../devel/scmgit/Makefile.common"
 
-PKGREVISION=	1
-
 PKGNAME=	scmgit-base-${GIT_VERSION}
 COMMENT=	GIT Tree History Storage Tool (base package)
 
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index df475342582..ca663a23b8b 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2012/03/09 17:02:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2012/04/13 20:43:24 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -188,6 +188,7 @@ libexec/git-core/git-write-tree
 libexec/git-core/mergetools/araxis
 libexec/git-core/mergetools/bc3
 libexec/git-core/mergetools/defaults
+libexec/git-core/mergetools/deltawalker
 libexec/git-core/mergetools/diffuse
 libexec/git-core/mergetools/ecmerge
 libexec/git-core/mergetools/emerge
@@ -279,3 +280,7 @@ ${PLIST.gui}share/gitk/lib/msgs/ru.msg
 ${PLIST.gui}share/gitk/lib/msgs/sv.msg
 @pkgdir share/examples/scmgit/templates/branches
 share/locale/is/LC_MESSAGES/git.mo
+share/locale/nl/LC_MESSAGES/git.mo
+share/locale/pt_PT/LC_MESSAGES/git.mo
+share/locale/sv/LC_MESSAGES/git.mo
+share/locale/zh_CN/LC_MESSAGES/git.mo
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 55a69b024d6..bae0cca310c 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.50 2012/03/09 17:02:14 adam Exp $
+$NetBSD: distinfo,v 1.51 2012/04/13 20:43:24 adam Exp $
 
-SHA1 (git-1.7.9.3.tar.gz) = 6216153da1139c25cb96cfb4441eff327013ec4f
-RMD160 (git-1.7.9.3.tar.gz) = 3f45d8262526dfbc576004b8f50a92a6c33cf4d6
-Size (git-1.7.9.3.tar.gz) = 3615900 bytes
+SHA1 (git-1.7.10.tar.gz) = 501ee8685c148d377950e42c111e01d83fd1d41a
+RMD160 (git-1.7.10.tar.gz) = 03bd54cf6158aa1a2f4bdf77a31b7dc5d87544ec
+Size (git-1.7.10.tar.gz) = 3753777 bytes
 SHA1 (patch-aa) = ce4ba3241b44e81f9a39986008fbb361062f8470
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = d420c0a1db0de77bd9713d066434981b20bd4299
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 158ae5c2a11..c84ff87e463 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.37 2012/03/09 17:02:14 adam Exp $
+# $NetBSD: Makefile.version,v 1.38 2012/04/13 20:43:24 adam Exp $
 #
 # used by devel/scmgit/Makefile.common
 # used by www/gitweb/Makefile
 
-GIT_VERSION=	1.7.9.3
+GIT_VERSION=	1.7.10