| commit | 57bddb115331a23816af772172531fb56fceace4 | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Thu, 7 Jan 2010 16:32:19 +0000 (7 17:32 +0100) | ||
| committer | Thomas Rast <trast@student.ethz.ch> | |
| Sat, 9 Jan 2010 20:08:24 +0000 (9 21:08 +0100) | ||
| tree | 8e32ab9033cc42e9d45d711285a8bdbbbc11697c | treesnapshot (tar.gz zip) |
| parent | d6f8fd0b3eeb4349493209740742d67616e0263c | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory |