Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Fix wording in push definition.
author
Ralf Wildenhues
<Ralf.Wildenhues@gmx.de>
Tue, 9 Oct 2007 21:01:05 +0000
(23:01 +0200)
committer
Shawn O. Pearce
<spearce@spearce.org>
Tue, 16 Oct 2007 02:11:02 +0000
(22:11 -0400)
Make the definition of push in the glossary readable.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Documentation/glossary.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
06ada15
)
diff --git
a/Documentation/glossary.txt
b/Documentation/glossary.txt
index d99fa199d65edb56838cfbd6944a2d681b45615b..56451775e70e313311ac0cfbc286fa262eb15d5c 100644
(file)
--- a/
Documentation/glossary.txt
+++ b/
Documentation/glossary.txt
@@
-301,8
+301,8
@@
This commit is referred to as a "merge commit", or sometimes just a
[[def_push]]push::
Pushing a <<def_branch,branch>> means to get the branch's
<<def_head_ref,head ref>> from a remote <<def_repository,repository>>,
[[def_push]]push::
Pushing a <<def_branch,branch>> means to get the branch's
<<def_head_ref,head ref>> from a remote <<def_repository,repository>>,
- find out if it is a
n
ancestor to the branch's local
- head ref
is a direct
, and in that case, putting all
+ find out if it is a
direct
ancestor to the branch's local
+ head ref, and in that case, putting all
objects, which are <<def_reachable,reachable>> from the local
head ref, and which are missing from the remote
repository, into the remote
objects, which are <<def_reachable,reachable>> from the local
head ref, and which are missing from the remote
repository, into the remote