summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandro Lucarella <leandro.lucarella@sociomantic.com>2014-12-15 12:29:42 +0100
committerMihails Strasuns <mihails.strasuns@sociomantic.com>2014-12-18 07:56:30 +0100
commite89421751b5c70670cf983d06ebb614367c004e0 (patch)
tree78a5ca947e383cc03a0e3b5d366eba24b985354d
parent3f139db14daae15e567a5d7f80e32f413b23cb28 (diff)
man: Fix git stash pop command in pull rebase
-rw-r--r--man.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/man.rst b/man.rst
index c6f949f..7f112bc 100644
--- a/man.rst
+++ b/man.rst
@@ -317,7 +317,7 @@ COMMANDS
5. git push `pullbase`
6. git checkout `oldhead`
7. git branch -D `tmp`
- 8. git pop
+ 8. git stash pop
If `hub.forcerebase` is set to "true" (the default), ``--force`` will be
passed to rebase (not to be confused with this command option