From ccc2fcf54cd6cfa9f15c110d064e10aa8d71ddb1 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 Apr 2011 14:24:27 +0200 Subject: [PATCH 1/2] git-svn.txt: Document --mergeinfo 6abd933 (git-svn: allow the mergeinfo property to be set, 2010-09-24) introduced the --mergeinfo option. Document it. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git-svn.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index e161a40a7..4f262a935 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -217,6 +217,13 @@ config key: svn.commiturl (overwrites all svn-remote..commiturl options) Using this option for any other purpose (don't ask) is very strongly discouraged. +--mergeinfo=;; + Add the given merge information during the dcommit + (e.g. `--mergeinfo="/branches/foo:1-10"`). All svn server versions can + store this information (as a property), and svn clients starting from + version 1.5 can make use of it. 'git svn' currently does not use it + and does not set it automatically. + 'branch':: Create a branch in the SVN repository. From 4fec83045bdc53ed9d3ff71ed099e3e6992b5c56 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 19 Apr 2011 11:45:38 -0700 Subject: [PATCH 2/2] Git 1.7.4.5 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.4.5.txt | 4 ++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/1.7.4.5.txt diff --git a/Documentation/RelNotes/1.7.4.5.txt b/Documentation/RelNotes/1.7.4.5.txt new file mode 100644 index 000000000..b7a0eeb22 --- /dev/null +++ b/Documentation/RelNotes/1.7.4.5.txt @@ -0,0 +1,4 @@ +Git v1.7.4.5 Release Notes +========================== + +This contains only minor documentation fixes accumulated since 1.7.4.4. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 8557ac0c4..bc1746ef1 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.4.4 +DEF_VER=v1.7.4.5 LF=' ' diff --git a/RelNotes b/RelNotes index 211e93c76..0e5a85a54 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.4.4.txt \ No newline at end of file +Documentation/RelNotes/1.7.4.5.txt \ No newline at end of file