diff options
| author | adam <adam@pkgsrc.org> | 2011-05-21 17:25:13 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-05-21 17:25:13 +0000 |
| commit | 1fcbc94927d5a2d65dc382a49a0bf1f72ff379ba (patch) | |
| tree | c5b764bde0978b45ea152bd7ada262dcfd847ee0 /devel | |
| parent | a7ce1993d2914bbaa9e9be3cd48d1c1e1a278536 (diff) | |
| download | pkgsrc-1fcbc94927d5a2d65dc382a49a0bf1f72ff379ba.tar.gz | |
Changes 1.7.5.2:
* "git add -p" did not work correctly when a hunk is split and then
one of them was given to the editor.
* "git add -u" did not resolve a conflict where our history deleted and
their history modified the same file, and the working tree resolved to
keep a file.
* "git cvsimport" did not know that CVSNT stores its password file in a
location different from the traditional CVS.
* "git diff-files" did not show the mode information from the working
tree side of an unmerged path correctly.
* "git diff -M --cached" used to use unmerged path as a possible rename
source candidate, which made no sense.
* The option name parser in "git fast-import" used prefix matches for
some options where it shouldn't, and accepted non-existent options,
e.g. "--relative-marksmith" or "--forceps".
* "git format-patch" did not quote RFC822 special characters in the
email address (e.g From: Junio C. Hamano <jch@example.com>, not
From: "Junio C. Hamano" <jch@example.com>).
* "git format-patch" when run with "--quiet" option used to produce a
nonsense result that consists of alternating empty output.
* In "git merge", per-branch branch.<name>.mergeoptions configuration
variables did not override the fallback default merge.<option>
configuration variables such as merge.ff, merge.log, etc.
* "git merge-one-file" did not honor GIT_WORK_TREE settings when
handling a "both sides added, differently" conflict.
* "git mergetool" did not handle conflicted submoudules gracefully.
* "git-p4" (in contrib) used a wrong base image while merge a file that
was added on both branches differently.
* "git rebase -i -p" failed to preserve the history when there is a
redundant merge created with the --no-ff option.
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 4e0d2b394a5..b60989a5589 100644 --- a/devel/scmgit-base/distinfo +++ b/devel/scmgit-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.36 2011/05/05 10:57:07 adam Exp $ +$NetBSD: distinfo,v 1.37 2011/05/21 17:25:14 adam Exp $ -SHA1 (git-1.7.5.1.tar.bz2) = 7ae089a8e252e8b2ce84ad018d55d6ba6f4b5591 -RMD160 (git-1.7.5.1.tar.bz2) = 981a73b0492bd66ee0f99e0e3adba19ad436197e -Size (git-1.7.5.1.tar.bz2) = 2753815 bytes +SHA1 (git-1.7.5.2.tar.bz2) = c7cc4f9b0a8718e966d32c8f834df67ed2b5560f +RMD160 (git-1.7.5.2.tar.bz2) = c1e4e065b0fe7e756d22ac0a3c867ebd4923bb4c +Size (git-1.7.5.2.tar.bz2) = 2766306 bytes SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version index b6d8c3971fb..6a1f01a62ee 100644 --- a/devel/scmgit/Makefile.version +++ b/devel/scmgit/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.23 2011/05/05 10:57:06 adam Exp $ +# $NetBSD: Makefile.version,v 1.24 2011/05/21 17:25:13 adam Exp $ -GIT_VERSION= 1.7.5.1 +GIT_VERSION= 1.7.5.2 |