summaryrefslogtreecommitdiff
path: root/Documentation/git-sh-setup.txt
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-01-07 16:32:19 (GMT)
committerThomas Rast <trast@student.ethz.ch>2010-01-09 20:08:24 (GMT)
commit57bddb115331a23816af772172531fb56fceace4 (patch)
tree8e32ab9033cc42e9d45d711285a8bdbbbc11697c /Documentation/git-sh-setup.txt
parentd6f8fd0b3eeb4349493209740742d67616e0263c (diff)
downloadgit-57bddb115331a23816af772172531fb56fceace4.zip
git-57bddb115331a23816af772172531fb56fceace4.tar.gz
git-57bddb115331a23816af772172531fb56fceace4.tar.bz2
Documentation/git-merge: reword references to "remote" and "pull"
The git-merge manpage was written in terms of merging a "remote", which is no longer the case: you merge local or remote-tracking branches; pull is for actual remotes. Adjust the manpage accordingly. We refer to the arguments as "commits", and change instances of "remote" to "other" (where branches are concerned) or "theirs" (where conflict sides are concerned). Remove the single reference to "pulling". Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Diffstat (limited to 'Documentation/git-sh-setup.txt')
0 files changed, 0 insertions, 0 deletions