summaryrefslogtreecommitdiffstats
path: root/cmds-mainporcelain.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 15:47:46 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-12 15:47:46 -0700
commit8401f142a88980c91f3af6f06199e5579c9143c6 (patch)
tree3bce834aaee41a0b122eb45ab2ce5fb26a747df8 /cmds-mainporcelain.txt
parent5865559b9be66a59108c9f38b1e9f4d91201ebc6 (diff)
downloadgit-htmldocs-8401f142a88980c91f3af6f06199e5579c9143c6.tar.gz
Autogenerated HTML docs for v1.8.3.2-804-g0da7a
Diffstat (limited to 'cmds-mainporcelain.txt')
-rw-r--r--cmds-mainporcelain.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt
index 84602e9a0..4017dab7f 100644
--- a/cmds-mainporcelain.txt
+++ b/cmds-mainporcelain.txt
@@ -71,7 +71,7 @@ linkgit:git-notes[1]::
Add or inspect object notes.
linkgit:git-pull[1]::
- Fetch from and merge with another repository or a local branch.
+ Fetch from and integrate with another repository or a local branch.
linkgit:git-push[1]::
Update remote refs along with associated objects.