summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-18 22:39:56 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-18 22:39:56 -0700
commit636e87d705c2d6cc53d58eac31b689779d00b292 (patch)
treea3de44b428a21e7bbcae6099a903e77fc9c9db16 /Documentation
parent1c9eecff97beab2d425397dc624281dff5c0be5c (diff)
parentd07ef715757ab1c2436c59adca92484fa46b2b41 (diff)
downloadgit-636e87d705c2d6cc53d58eac31b689779d00b292.tar.gz
Merge branch 'maint'
* maint: Documentation/gitdiffcore: fix order in pickaxe description Documentation: fix minor inconsistency Documentation: rebase -i ignores options passed to "git am" hash_object: correction for zero length file
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/git-rebase.txt1
-rw-r--r--Documentation/gitdiffcore.txt4
3 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e5aa2cacfa..39140bad4d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1525,7 +1525,7 @@ receive.denyDeletes::
the ref. Use this to prevent such a ref deletion via a push.
receive.denyCurrentBranch::
- If set to true or "refuse", receive-pack will deny a ref update
+ If set to true or "refuse", git-receive-pack will deny a ref update
to the currently checked out branch of a non-bare repository.
Such a push is potentially dangerous because it brings the HEAD
out of sync with the index and working tree. If set to "warn",
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 0d07b1b207..5863decdc9 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -295,6 +295,7 @@ link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details).
--ignore-date::
These flags are passed to 'git am' to easily change the dates
of the rebased commits (see linkgit:git-am[1]).
+ Incompatible with the --interactive option.
-i::
--interactive::
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index 9de8caf5d1..5d91a7e5b3 100644
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -227,8 +227,8 @@ changes that touch a specified string, and is controlled by the
commands.
When diffcore-pickaxe is in use, it checks if there are
-filepairs whose "original" side has the specified string and
-whose "result" side does not. Such a filepair represents "the
+filepairs whose "result" side has the specified string and
+whose "origin" side does not. Such a filepair represents "the
string appeared in this changeset". It also checks for the
opposite case that loses the specified string.