diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-08-25 03:54:27 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-08-25 03:54:27 +0000 |
| commit | a63874253759767733cadcdda3933ad2475e905a (patch) | |
| tree | f680bb640b9310d878ae526f732026fb906ba43c /git-svn.txt | |
| parent | 377018d6a9542bbf1ff146837845b14e3b2c5259 (diff) | |
| download | git-htmldocs-a63874253759767733cadcdda3933ad2475e905a.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc6-23-g0058
Diffstat (limited to 'git-svn.txt')
| -rw-r--r-- | git-svn.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.txt b/git-svn.txt index 3e2a63b74..3420c5c95 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -99,7 +99,7 @@ COMMANDS This works similarly to 'svn update' or 'git-pull' except that it preserves linear history with 'git-rebase' instead of -'git-merge' for ease of dcommit-ing with git-svn. +'git-merge' for ease of dcommiting with git-svn. This accepts all options that 'git-svn fetch' and 'git-rebase' accepts. However '--fetch-all' only fetches from the current @@ -551,7 +551,7 @@ listed below are allowed: Keep in mind that the '*' (asterisk) wildcard of the local ref (left of the ':') *must* be the farthest right path component; however the remote wildcard may be anywhere as long as it's own -independent path componet (surrounded by '/' or EOL). This +independent path component (surrounded by '/' or EOL). This type of configuration is not automatically created by 'init' and should be manually entered with a text-editor or using gitlink:git-config[1] |