diff options
| author | adam <adam> | 2010-10-28 10:23:07 +0000 |
|---|---|---|
| committer | adam <adam> | 2010-10-28 10:23:07 +0000 |
| commit | 16dfff841a18f402782516e8b483933fb89f1598 (patch) | |
| tree | 5f199a90a6cec483d4819cbb63415459620947a0 /devel/scmgit-docs | |
| parent | 79358f537b80f917177dfa518715f80803d732e4 (diff) | |
| download | pkgsrc-16dfff841a18f402782516e8b483933fb89f1598.tar.gz | |
Changes 1.7.3.2:
This is primarily to push out many documentation fixes accumulated since
the 1.7.3.1 release.
Changes 1.7.3.1:
* "git stash show stash@{$n}" was accidentally broken in 1.7.3 ("git
stash show" without any argument still worked, though).
* "git stash branch $branch stash@{$n}" was accidentally broken in
1.7.3 and started dropping the named stash even when branch creation
failed.
Changes 1.7.3:
* git-gui, now at version 0.13.0, got various updates and a new
maintainer, Pat Thoyts.
* Gitweb allows its configuration to change per each request; it used to
read the configuration once upon startup.
* When git finds a corrupt object, it now reports the file that contains
it.
* "git checkout -B <it>" is a shorter way to say "git branch -f <it>"
followed by "git checkout <it>".
* When "git checkout" or "git merge" refuse to proceed in order to
protect local modification to your working tree, they used to stop
after showing just one path that might be lost. They now show all,
in a format that is easier to read.
* "git clean" learned "-e" ("--exclude") option.
* Hunk headers produced for C# files by "git diff" and friends show more
relevant context than before.
* diff.ignoresubmodules configuration variable can be used to squelch the
differences in submodules reported when running commands (e.g. "diff",
"status", etc.) at the superproject level.
* http.useragent configuration can be used to lie who you are to your
restrictive firewall.
* "git rebase --strategy <s>" learned "-X" option to pass extra options
that are understood by the chosen merge strategy.
* "git rebase -i" learned "exec" that you can insert into the insn sheet
to run a command between its steps.
* "git rebase" between branches that have many binary changes that do
not conflict should be faster.
* "git rebase -i" peeks into rebase.autosquash configuration and acts as
if you gave --autosquash from the command line.
Diffstat (limited to 'devel/scmgit-docs')
| -rw-r--r-- | devel/scmgit-docs/Makefile | 11 | ||||
| -rw-r--r-- | devel/scmgit-docs/PLIST | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile index 840c5456a4d..c4d2e1b72ea 100644 --- a/devel/scmgit-docs/Makefile +++ b/devel/scmgit-docs/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/02/22 09:20:30 obache Exp $ -# +# $NetBSD: Makefile,v 1.10 2010/10/28 10:23:08 adam Exp $ PKGNAME= scmgit-docs-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (documentation) @@ -20,6 +19,14 @@ INSTALL_TARGET= install-doc 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" diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST index 005e144adea..cca196585f2 100644 --- a/devel/scmgit-docs/PLIST +++ b/devel/scmgit-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2010/01/15 10:36:41 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/10/28 10:23:08 adam Exp $ man/man1/git-add.1 man/man1/git-am.1 man/man1/git-annotate.1 @@ -148,6 +148,7 @@ man/man7/gitcore-tutorial.7 man/man7/gitcvs-migration.7 man/man7/gitdiffcore.7 man/man7/gitglossary.7 +man/man7/gitrevisions.7 man/man7/gittutorial-2.7 man/man7/gittutorial.7 man/man7/gitworkflows.7 |