diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-09 15:08:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-09 15:08:19 -0800 |
| commit | 368c2ac249ac2261784e1b9b9bc7c98c5e859052 (patch) | |
| tree | 6576c6616785ebad6d6dc4a296f4baaf691254f8 /Documentation | |
| parent | 18d5453ed36331b3f4123afae6c1c6bb4ef4d0a5 (diff) | |
| parent | a6ec3c1599f990b4f2f3dab2606688639f74d844 (diff) | |
| download | git-368c2ac249ac2261784e1b9b9bc7c98c5e859052.tar.gz git-368c2ac249ac2261784e1b9b9bc7c98c5e859052.tar.xz | |
Merge branch 'maint'
* maint:
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
git-svn: fix dcommit losing changes when out-of-date from svn
git-svn: don't die on rebuild when --upgrade is specified
git-svn: avoid printing filenames of files we're not tracking
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-svn.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 450ff1f85..a764d1f8e 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -120,6 +120,7 @@ manually joining branches on commit. URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a git-svn-aware repository (that has been init-ed with git-svn). + The -r<revision> option is required for this. 'graft-branches':: This command attempts to detect merges/branches from already |