aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-09-18 14:24:21 +0200
committerMattias Andrée <maandree@operamail.com>2013-09-18 14:24:21 +0200
commit8130fc44fd850a9663fedadeaecdc26119ec89ef (patch)
tree3ce41667bff57e7d74ff70a2148ba38533adcd03 /using-git.texinfo
parentadd object * to glossary (diff)
downloadusing-git-8130fc44fd850a9663fedadeaecdc26119ec89ef.tar.gz
using-git-8130fc44fd850a9663fedadeaecdc26119ec89ef.tar.bz2
using-git-8130fc44fd850a9663fedadeaecdc26119ec89ef.tar.xz
add rebase to glossary
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r--using-git.texinfo6
1 files changed, 4 insertions, 2 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index 550712b..dd37aa9 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -2166,8 +2166,10 @@ branch, often a remote-tracking branch.
The adcttion of sending updates to a remote
repository.
-@c @item reachable
-@c @item rebase
+@item rebase
+The action of rewriting history by pretending
+that you pulled updates before committing.
+
@c @item ref
@c @item reflog
@c @item refspec