aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-04 00:12:19 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-04 00:12:19 -0800
commitb63bc0bc3152ca42ba1c9fa9bed73da061beeca2 (patch)
tree709ceb2c6c62fa58f4d694599374ef10ac305cfe /Documentation
parent738a94a9f645a5f63fbccaab76d5e43a97e53d78 (diff)
parentf0817310903312bbc243dd80f066e17a8e0e4b1d (diff)
downloadgit-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.tar.gz
git-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.tar.xz
Merge branch 'maint'
* maint: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind Conflicts: Makefile
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/technical/api-strbuf.txt2
-rw-r--r--Documentation/user-manual.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt
index 9a4e3ea92..ac56d1c47 100644
--- a/Documentation/technical/api-strbuf.txt
+++ b/Documentation/technical/api-strbuf.txt
@@ -21,7 +21,7 @@ allocated memory or not), use `strbuf_detach()` to unwrap a memory
buffer from its strbuf shell in a safe way. That is the sole supported
way. This will give you a malloced buffer that you can later `free()`.
+
-However, it it totally safe to modify anything in the string pointed by
+However, it is totally safe to modify anything in the string pointed by
the `buf` member, between the indices `0` and `len-1` (inclusive).
. The `buf` member is a byte array that has at least `len + 1` bytes
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 19f571ae3..96af8977f 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1507,7 +1507,7 @@ so on a different branch and then coming back), unstash the
work-in-progress changes.
------------------------------------------------
-$ git stash "work in progress for foo feature"
+$ git stash save "work in progress for foo feature"
------------------------------------------------
This command will save your changes away to the `stash`, and