summaryrefslogtreecommitdiff
path: root/devel/scmgit
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2012-07-09 14:30:49 +0000
committeradam <adam@pkgsrc.org>2012-07-09 14:30:49 +0000
commit71e19f32487b1934852a32593f4cb233d64a1543 (patch)
tree2bac04d24be70e42a816db1d12f547a1d63d8a16 /devel/scmgit
parent1ac8433cc8fdc8d236b32b79f124a3a5d01b5e45 (diff)
downloadpkgsrc-71e19f32487b1934852a32593f4cb233d64a1543.tar.gz
Changes 1.7.11.1:
* The cross links in the HTML version of manual pages were broken. Also contains minor typofixes and documentation updates. Changes 1.7.11: UI, Workflows & Features * A new mode for push, "simple", which is a cross between "current" and "upstream", has been introduced. "git push" without any refspec will push the current branch out to the same name at the remote repository only when it is set to track the branch with the same name over there. The plan is to make this mode the new default value when push.default is not configured. * A couple of commands learned the "--column" option to produce columnar output. * A third-party tool "git subtree" is distributed in contrib/ * A remote helper that acts as a proxy and caches ssl session for the https:// transport is added to the contrib/ area. * Error messages given when @{u} is used for a branch without its upstream configured have been clarified. * Even with the "-q"uiet option, "checkout" used to report setting up tracking. Also "branch" learned the "-q"uiet option to squelch informational message. * Your build platform may support hardlinks but you may prefer not to use them, e.g. when installing to DESTDIR to make a tarball and untarring on a filesystem that has poor support for hardlinks. There is a Makefile option NO_INSTALL_HARDLINKS for you. * The smart-http backend used to always override GIT_COMMITTER_* variables with REMOTE_USER and REMOTE_ADDR, but these variables are now preserved when set. * "git am" learned the "--include" option, which is an opposite of existing the "--exclude" option. * When "git am -3" needs to fall back to an application of the patch to a synthesized preimage followed by a 3-way merge, the paths that needed such treatment are now reported to the end user, so that the result in them can be eyeballed with extra care. * The output from "diff/log --stat" used to always allocate 4 columns to show the number of modified lines, but not anymore. * "git difftool" learned the "--dir-diff" option to spawn external diff tools that can compare two directory hierarchies at a time after populating two temporary directories, instead of running an instance of the external tool once per a file pair. * The "fmt-merge-msg" command learned to list the primary contributors involved in the side topic you are merging in a comment in the merge commit template. * "git rebase" learned to optionally keep commits that do not introduce any change in the original history. * "git push --recurse-submodules" learned to optionally look into the histories of submodules bound to the superproject and push them out. * A 'snapshot' request to "gitweb" honors If-Modified-Since: header, based on the commit date. * "gitweb" learned to highlight the patch it outputs even more.
Diffstat (limited to 'devel/scmgit')
-rw-r--r--devel/scmgit/Makefile.version4
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 15aa3f8c0c0..3574580c479 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.43 2012/06/18 17:36:55 gdt Exp $
+# $NetBSD: Makefile.version,v 1.44 2012/07/09 14:30:49 adam Exp $
#
# used by devel/scmgit/Makefile.common
# used by www/gitweb/Makefile
-GIT_VERSION= 1.7.10.5
+GIT_VERSION= 1.7.11.1