diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-22 20:18:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-22 20:18:37 -0700 |
| commit | bc38219f50ba9228945fba8e900d636f15082f16 (patch) | |
| tree | 06e090679892d927c141aac808b37a49de52466e /Documentation/RelNotes-1.7.0.txt | |
| parent | Typos in code comments, an error message, documentation (diff) | |
| parent | Typos in code comments, an error message, documentation (diff) | |
| download | tgif-bc38219f50ba9228945fba8e900d636f15082f16.tar.xz | |
Merge branch 'maint'
* maint:
Typos in code comments, an error message, documentation
Diffstat (limited to 'Documentation/RelNotes-1.7.0.txt')
| -rw-r--r-- | Documentation/RelNotes-1.7.0.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt index 43e3f33615..0bb8c0b2a2 100644 --- a/Documentation/RelNotes-1.7.0.txt +++ b/Documentation/RelNotes-1.7.0.txt @@ -202,7 +202,7 @@ release, unless otherwise noted. the branch is fully merged to its upstream branch if it is not merged to the current branch. It now deletes it in such a case. - * "fiter-branch" command incorrectly said --prune-empty and --filter-commit + * "filter-branch" command incorrectly said --prune-empty and --filter-commit were incompatible; the latter should be read as --commit-filter. * When using "git status" or asking "git diff" to compare the work tree |