diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-24 19:05:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-24 19:05:30 (GMT) |
| commit | 74b819aa31bbb436d46e03ab6ee1b82fb8da1b93 (patch) | |
| tree | 15162b605c9474378aa2b41aa18da1f24f979cea /Documentation/git-filter-branch.txt | |
| parent | c247d76c5419df96db62f6e7c9cf4f672f24a727 (diff) | |
| parent | 831e61f80fab2d3f9ba1773e657803dcf8b16432 (diff) | |
| download | git-74b819aa31bbb436d46e03ab6ee1b82fb8da1b93.zip git-74b819aa31bbb436d46e03ab6ee1b82fb8da1b93.tar.gz git-74b819aa31bbb436d46e03ab6ee1b82fb8da1b93.tar.bz2 | |
Merge branch 'jc/tag-doc' into maint-1.7.11
Our documentation used to assume having files in .git/refs/*
directories was the only to have branches and tags, but that is not
true for quite some time.
* jc/tag-doc:
Documentation: do not mention .git/refs/* directories
Diffstat (limited to 'Documentation/git-filter-branch.txt')
| -rw-r--r-- | Documentation/git-filter-branch.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 81f5823..15e7ac8 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -32,7 +32,8 @@ changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some git bugs or such, therefore such a usage is permitted. -*NOTE*: This command honors `.git/info/grafts` and `.git/refs/replace/`. +*NOTE*: This command honors `.git/info/grafts` file and refs in +the `refs/replace/` namespace. If you have any grafts or replacement refs defined, running this command will make them permanent. |