aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-15 13:32:09 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-15 13:32:09 -0700
commit1d5742cbf746f9556e6aefdfbed54c452c235d51 (patch)
treeed10a8a35c9cc115e883780907f2a1faf24d6719 /Documentation/git-rebase.txt
parenta35138af75070adb32cf281a56186c9343af36a4 (diff)
parentd8f708f860095245c6973ba6b1ada366ce2d5bdf (diff)
downloadgit-1d5742cbf746f9556e6aefdfbed54c452c235d51.tar.gz
git-1d5742cbf746f9556e6aefdfbed54c452c235d51.tar.xz
Merge branch 'jk/doc-credits' of git://github.com/peff/git
* 'jk/doc-credits' of git://github.com/peff/git: docs: point git.txt author credits to git-scm.com doc: add missing git footers doc: drop author/documentation sections from most pages
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt10
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index ac3589464..620d50e71 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -659,7 +659,6 @@ The ripple effect of a "hard case" recovery is especially bad:
'everyone' downstream from 'topic' will now have to perform a "hard
case" recovery too!
-
BUGS
----
The todo list presented by `--preserve-merges --interactive` does not
@@ -682,15 +681,6 @@ by moving the "pick 4" line will result in the following history:
1 --- 2 --- 4 --- 5
------------
-Authors
-------
-Written by Junio C Hamano <gitster@pobox.com> and
-Johannes E. Schindelin <johannes.schindelin@gmx.de>
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
GIT
---
Part of the linkgit:git[1] suite