1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-29 21:37:53 +01:00
git/Documentation/howto
Marc Branchaud b499549401 Teach rebase the --no-ff option.
For git-rebase.sh, --no-ff is a synonym for --force-rebase.

For git-rebase--interactive.sh, --no-ff cherry-picks all the commits in
the rebased branch, instead of fast-forwarding over any unchanged commits.

--no-ff offers an alternative way to deal with reverted merges.  Instead of
"reverting the revert" you can use "rebase --no-ff" to recreate the branch
with entirely new commits (they're new because at the very least the
committer time is different).  This obviates the need to revert the
reversion, as you can re-merge the new topic branch directly.  Added an
addendum to revert-a-faulty-merge.txt describing the situation and how to
use --no-ff to handle it.

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-24 14:42:57 -07:00
..
maintain-git.txt Use 'fast-forward' all over the place 2009-10-24 23:50:28 -07:00
rebase-from-internal-branch.txt Fix Documentation typos surrounding the word 'handful'. 2009-01-13 00:18:53 -08:00
rebuild-from-update-hook.txt Update my e-mail address 2008-07-21 12:14:42 -07:00
recover-corrupted-blob-object.txt add a howto document about corrupted blob recovery 2007-11-09 21:16:54 -08:00
revert-a-faulty-merge.txt Teach rebase the --no-ff option. 2010-03-24 14:42:57 -07:00
revert-branch-rebase.txt Use 'fast-forward' all over the place 2009-10-24 23:50:28 -07:00
separating-topic-branches.txt Update my e-mail address 2008-07-21 12:14:42 -07:00
setup-git-server-over-http.txt Documentation: Typo / spelling / formatting fixes 2009-03-03 21:43:19 -08:00
update-hook-example.txt Use 'fast-forward' all over the place 2009-10-24 23:50:28 -07:00
use-git-daemon.txt War on whitespace 2007-06-07 00:04:01 -07:00
using-merge-subtree.txt Add using merge subtree How-To 2008-01-14 18:04:51 -08:00