Skip to content

Commit 0e73bb4

Browse files
committed
Sync with 1.7.4.5
Signed-off-by: Junio C Hamano <[email protected]>
2 parents 60e199c + 4fec830 commit 0e73bb4

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

Documentation/RelNotes/1.7.4.5.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Git v1.7.4.5 Release Notes
2+
==========================
3+
4+
This contains only minor documentation fixes accumulated since 1.7.4.4.

Documentation/git-svn.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,13 @@ config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)
217217
Using this option for any other purpose (don't ask) is very strongly
218218
discouraged.
219219

220+
--mergeinfo=<mergeinfo>;;
221+
Add the given merge information during the dcommit
222+
(e.g. `--mergeinfo="/branches/foo:1-10"`). All svn server versions can
223+
store this information (as a property), and svn clients starting from
224+
version 1.5 can make use of it. 'git svn' currently does not use it
225+
and does not set it automatically.
226+
220227
'branch'::
221228
Create a branch in the SVN repository.
222229

0 commit comments

Comments
 (0)