From: Junio C Hamano Date: Tue, 15 Mar 2011 20:32:09 +0000 (-0700) Subject: Merge branch 'jk/doc-credits' of git://github.com/peff/git X-Git-Tag: v1.7.5-rc0~81 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1d5742cbf746f9556e6aefdfbed54c452c235d51?ds=inline;hp=-c 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 --- 1d5742cbf746f9556e6aefdfbed54c452c235d51 diff --combined Documentation/git-rebase.txt index ac35894640,671f04a281..620d50e71f --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@@ -66,9 -66,8 +66,9 @@@ would be D---E---F---G master ------------ -The latter form is just a short-hand of `git checkout topic` -followed by `git rebase master`. +*NOTE:* The latter form is just a short-hand of `git checkout topic` +followed by `git rebase master`. When rebase exits `topic` will +remain the checked-out branch. If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit @@@ -659,7 -658,6 +659,6 @@@ The ripple effect of a "hard case" reco '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 -680,6 +681,6 @@@ by moving the "pick 4" line will resul 1 --- 2 --- 4 --- 5 ------------ - Authors - ------ - Written by Junio C Hamano and - Johannes E. Schindelin - - Documentation - -------------- - Documentation by Junio C Hamano and the git-list . - GIT --- Part of the linkgit:git[1] suite