diff options
| author | Mike Ralphson <mike@abacus.co.uk> | 2009-03-03 19:29:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-04 05:40:36 (GMT) |
| commit | c0bc2eeb1e03593ca816f63deda662da5a25ab83 (patch) | |
| tree | f68bc42e687d5e7d493c76b019670dccffc7c8b4 /Documentation/RelNotes-1.6.1.1.txt | |
| parent | 8d1b9d23a04f43f45bd3b20616936fcdd3021446 (diff) | |
| download | git-c0bc2eeb1e03593ca816f63deda662da5a25ab83.zip git-c0bc2eeb1e03593ca816f63deda662da5a25ab83.tar.gz git-c0bc2eeb1e03593ca816f63deda662da5a25ab83.tar.bz2 | |
Documentation: Typos / spelling fixes in RelNotes
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes-1.6.1.1.txt')
| -rw-r--r-- | Documentation/RelNotes-1.6.1.1.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt index 88454c1..8c594ba 100644 --- a/Documentation/RelNotes-1.6.1.1.txt +++ b/Documentation/RelNotes-1.6.1.1.txt @@ -41,11 +41,11 @@ Fixes since v1.6.1 work tree upon delete/modify conflict. * "git merge -s recursive" didn't leave the index unmerged for entries with - rename/delete conflictd. + rename/delete conflicts. * "git merge -s recursive" clobbered untracked files in the work tree. -* "git mv -k" with more than one errorneous paths misbehaved. +* "git mv -k" with more than one erroneous paths misbehaved. * "git read-tree -m -u" hence branch switching incorrectly lost a subdirectory in rare cases. |