diff options
author | adam <adam@pkgsrc.org> | 2011-04-06 14:08:27 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2011-04-06 14:08:27 +0000 |
commit | 4cb9c48cf10bb1fbd332c13b88390b8759ea3339 (patch) | |
tree | 2a06250a5fa67842d849f9d22c9abf2bbc5d61d3 /devel/scmgit-docs | |
parent | 6341731e558c9a8ebd12580e42918ace34a929fb (diff) | |
download | pkgsrc-4cb9c48cf10bb1fbd332c13b88390b8759ea3339.tar.gz |
Changes 1.7.4.3:
* "git apply" used to confuse lines updated by previous hunks as lines
that existed before when applying a hunk, contributing misapplication
of patches with offsets.
* "git branch --track" (and "git checkout --track --branch") used to
allow setting up a random non-branch that does not make sense to follow
as the "upstream". The command correctly diagnoses it as an error.
* "git checkout $other_branch" silently removed untracked symbolic links
in the working tree that are in the way in order to check out paths
under it from the named branch.
* "git cvsimport" did not bail out immediately when the cvs server cannot
be reached, spewing unnecessary error messages that complain about the
server response that it never got.
* "git diff --quiet" did not work very well with the "--diff-filter" option.
* "git grep -n" lacked a long-hand synonym --line-number.
* "git stash apply" reported the result of its operation by running
"git status" from the top-level of the working tree; it should (and
now does) run it from the user's working directory.
Diffstat (limited to 'devel/scmgit-docs')
-rw-r--r-- | devel/scmgit-docs/Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile index 96e701d9799..ad0d939d135 100644 --- a/devel/scmgit-docs/Makefile +++ b/devel/scmgit-docs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2010/10/28 11:11:00 adam Exp $ +# $NetBSD: Makefile,v 1.12 2011/04/06 14:08:27 adam Exp $ -PKGNAME= scmgit-docs-${GIT_VERSION} -COMMENT= GIT Tree History Storage Tool (documentation) +PKGNAME= scmgit-docs-${GIT_VERSION} +COMMENT= GIT Tree History Storage Tool (documentation) PKG_DESTDIR_SUPPORT= user-destdir @@ -18,14 +18,6 @@ INSTALL_TARGET= install-man UNLIMIT_RESOURCES+= datasize -# our asciidoc doesn't handle {litdd} in titles -SUBST_CLASSES+= litdd -SUBST_STAGE.litdd= pre-configure -SUBST_MESSAGE.litdd= Fixing {litdd} in text files. -SUBST_FILES.litdd= Documentation/git-*--*.txt -SUBST_SED.litdd= -e 's,{litdd},--,g' -SUBST_SED.litdd+= -e 's,^=====,,g' - .include "../../devel/scmgit/Makefile.common" .include "../../mk/bsd.pkg.mk" |