diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-19 18:49:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-19 18:49:13 (GMT) |
| commit | 0e73bb4dfc15472d0671c37fe03d577cd0af2380 (patch) | |
| tree | 3602d388024223b9c739196bb305ee439430ff12 /Documentation | |
| parent | 60e199c4d577514ed810b4ed0b6072fb3dbab903 (diff) | |
| parent | 4fec83045bdc53ed9d3ff71ed099e3e6992b5c56 (diff) | |
| download | git-0e73bb4dfc15472d0671c37fe03d577cd0af2380.zip git-0e73bb4dfc15472d0671c37fe03d577cd0af2380.tar.gz git-0e73bb4dfc15472d0671c37fe03d577cd0af2380.tar.bz2 | |
Sync with 1.7.4.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.4.5.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-svn.txt | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.4.5.txt b/Documentation/RelNotes/1.7.4.5.txt new file mode 100644 index 0000000..b7a0eeb --- /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/Documentation/git-svn.txt b/Documentation/git-svn.txt index 4aa6404..30a6748 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -217,6 +217,13 @@ config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options) Using this option for any other purpose (don't ask) is very strongly discouraged. +--mergeinfo=<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. |