From: Junio C Hamano Date: Fri, 21 Jul 2017 22:03:39 +0000 (-0700) Subject: Merge branch 'ks/fix-rebase-doc-picture' into maint X-Git-Tag: v2.14.0-rc1~2^2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bae7e3f153f90b96438e6972e31c540ae9cf8ca0?ds=inline;hp=-c Merge branch 'ks/fix-rebase-doc-picture' into maint Doc update. * ks/fix-rebase-doc-picture: doc: correct a mistake in an illustration --- bae7e3f153f90b96438e6972e31c540ae9cf8ca0 diff --combined Documentation/git-rebase.txt index 53f4e14444,3290fc5db9..652a99062c --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@@ -12,7 -12,7 +12,7 @@@ SYNOPSI [ []] 'git rebase' [-i | --interactive] [options] [--exec ] [--onto ] --root [] -'git rebase' --continue | --skip | --abort | --edit-todo +'git rebase' --continue | --skip | --abort | --quit | --edit-todo DESCRIPTION ----------- @@@ -252,11 -252,6 +252,11 @@@ leave out at most one of A and B, in wh will be reset to where it was when the rebase operation was started. +--quit:: + Abort the rebase operation but HEAD is not reset back to the + original branch. The index and working tree are also left + unchanged as a result. + --keep-empty:: Keep the commits that do not change anything from its parents in the result. @@@ -370,11 -365,6 +370,11 @@@ default is `--no-fork-point`, otherwis of the rebased commits (see linkgit:git-am[1]). Incompatible with the --interactive option. +--signoff:: + This flag is passed to 'git am' to sign off all the rebased + commits (see linkgit:git-am[1]). Incompatible with the + --interactive option. + -i:: --interactive:: Make a list of the commits which are about to be rebased. Let the @@@ -675,7 -665,7 +675,7 @@@ on this 'subsystem'. You might end up following: ------------ - o---o---o---o---o---o---o---o---o master + o---o---o---o---o---o---o---o master \ o---o---o---o---o subsystem \