From dec0b3257ff5828fdc225ce3adc9e03fd8c27de11933c08116feaf1cded3a1d9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 31 May 2012 15:04:45 +0000 Subject: [PATCH] Accepting request 122868 from devel:tools:scm - updated to version 1.7.10.3: * From this release on, the "git merge" command in an interactive session will start an editor when it automatically resolves the merge for the user to explain the resulting commit, just like the "git commit" command does when it wasn't given a commit message. * The "--binary/-b" options to "git am" have been a no-op for quite a while and were deprecated in mid 2008 (v1.6.0). When you give these options to "git am", it will now warn and ask you not to use them. * When you do not tell which branches and tags to push to the "git push" command in any way, the command used "matching refs" rule to update remote branches and tags with branches and tags with the same name you locally have. See details and more changes in Documentation/RelNotes/1.7.10.txt, 1.7.10.1.txt, 1.7.10.2.txt and 1.7.10.3.txt. (forwarded request 122712 from tiwai) OBS-URL: https://build.opensuse.org/request/show/122868 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=85 --- git-1.7.10.3.tar.gz | 3 +++ git-1.7.9.2.tar.gz | 3 --- git.changes | 21 +++++++++++++++++++++ git.spec | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 git-1.7.10.3.tar.gz delete mode 100644 git-1.7.9.2.tar.gz diff --git a/git-1.7.10.3.tar.gz b/git-1.7.10.3.tar.gz new file mode 100644 index 0000000..c8e5145 --- /dev/null +++ b/git-1.7.10.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b804058554fc58336b3daf8825e314041f24a83e9204c133a58641ed06abd6f7 +size 3811707 diff --git a/git-1.7.9.2.tar.gz b/git-1.7.9.2.tar.gz deleted file mode 100644 index 7778ec5..0000000 --- a/git-1.7.9.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75 -size 3611846 diff --git a/git.changes b/git.changes index 2ca3828..1670a08 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue May 29 11:13:32 CEST 2012 - tiwai@suse.de + +- updated to version 1.7.10.3: + * From this release on, the "git merge" command in an interactive + session will start an editor when it automatically resolves the + merge for the user to explain the resulting commit, just like the + "git commit" command does when it wasn't given a commit message. + + * The "--binary/-b" options to "git am" have been a no-op for quite a + while and were deprecated in mid 2008 (v1.6.0). When you give these + options to "git am", it will now warn and ask you not to use them. + + * When you do not tell which branches and tags to push to the "git + push" command in any way, the command used "matching refs" rule to + update remote branches and tags with branches and tags with the + same name you locally have. + + See details and more changes in Documentation/RelNotes/1.7.10.txt, + 1.7.10.1.txt, 1.7.10.2.txt and 1.7.10.3.txt. + ------------------------------------------------------------------- Tue May 1 16:40:22 UTC 2012 - frank.lichtenheld@sophos.com diff --git a/git.spec b/git.spec index 49860d5..b7ffe44 100644 --- a/git.spec +++ b/git.spec @@ -30,7 +30,7 @@ BuildRequires: perl-Error BuildRequires: python BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.7.9.2 +Version: 1.7.10.3 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0