diff options
author | gdt <gdt@pkgsrc.org> | 2012-06-18 17:36:55 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2012-06-18 17:36:55 +0000 |
commit | d42ee6c4d6f919e513a12329f32d20b1d0b6af58 (patch) | |
tree | 4d78b0f0ce23ecd04941d62bb531af0b47fcf7be /devel | |
parent | ca122dceec18011f3107272f2b8dd674f2fd1e40 (diff) | |
download | pkgsrc-d42ee6c4d6f919e513a12329f32d20b1d0b6af58.tar.gz |
Update to v1.7.10.5.
Fixes since v1.7.10.4
---------------------
* "git fast-export" did not give a readable error message when the
same mark erroneously appeared twice in the --import-marks input.
* "git rebase -p" used to pay attention to rebase.autosquash which
was wrong. "git rebase -p -i" should, but "git rebase -p" by
itself should not.
(ok agc@ to commit during freeze)
Diffstat (limited to 'devel')
-rw-r--r-- | devel/scmgit-base/distinfo | 8 | ||||
-rw-r--r-- | devel/scmgit/Makefile.version | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo index c43b52615e0..2d04851b0ca 100644 --- a/devel/scmgit-base/distinfo +++ b/devel/scmgit-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.55 2012/06/14 12:52:48 gdt Exp $ +$NetBSD: distinfo,v 1.56 2012/06/18 17:36:55 gdt Exp $ -SHA1 (git-1.7.10.4.tar.gz) = ddc305ab520246790faa72bbaab4b9bf5bcf23fa -RMD160 (git-1.7.10.4.tar.gz) = bd888267e8df8beb3f8b73ce49913a437c1bca55 -Size (git-1.7.10.4.tar.gz) = 3813469 bytes +SHA1 (git-1.7.10.5.tar.gz) = 9d0767ef195d3971a891efaf11996158cb341499 +RMD160 (git-1.7.10.5.tar.gz) = 870fc615575828abb14f418387fb316948fe022e +Size (git-1.7.10.5.tar.gz) = 3813587 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 a9706cc33fb..15aa3f8c0c0 100644 --- a/devel/scmgit/Makefile.version +++ b/devel/scmgit/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.42 2012/06/14 12:52:48 gdt Exp $ +# $NetBSD: Makefile.version,v 1.43 2012/06/18 17:36:55 gdt Exp $ # # used by devel/scmgit/Makefile.common # used by www/gitweb/Makefile -GIT_VERSION= 1.7.10.4 +GIT_VERSION= 1.7.10.5 |