diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-12 08:14:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-12 08:14:15 (GMT) |
| commit | 35865ca24500a0d46a012f7a55f39bf36389f7ba (patch) | |
| tree | 9ffdddf391bc8de021d60c7c9b631c1882b1bf2c /Documentation/git-branch.txt | |
| parent | 40e2524da9f9fb2806a66a694b9aee722ea3ef0a (diff) | |
| parent | 9b2a1821245c0e638f7b5e9da81118743fcc0120 (diff) | |
| download | git-35865ca24500a0d46a012f7a55f39bf36389f7ba.zip git-35865ca24500a0d46a012f7a55f39bf36389f7ba.tar.gz git-35865ca24500a0d46a012f7a55f39bf36389f7ba.tar.bz2 | |
Merge branch 'maint'
* maint:
for-each-ref: fix off by one read.
git-branch: remove mention of non-existent '-b' option
git-svn: prevent dcommitting if the index is dirty.
Fix memory leak in traverse_commit_list
Diffstat (limited to 'Documentation/git-branch.txt')
| -rw-r--r-- | Documentation/git-branch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 5e81aa4..5ce905d 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -105,7 +105,7 @@ OPTIONS '--track' were given. --no-track:: - When -b is given and a branch is created off a remote branch, + When a branch is created off a remote branch, set up configuration so that git-pull will not retrieve data from the remote branch, ignoring the branch.autosetupmerge configuration variable. |