Lines Matching refs:rebase

285 Git-rebase, which allows us to clean up the commit history. So don't worry
801 After that we have the pleasure of doing an interactive 'rebase' to clean up
810 tutorial and 'rebase' it. You should try following along with your own
817 152d39fe7 (HEAD -> tutorial-rebase2, tutorial-rebase) tutorial: Start Submitting patch section
823 1e24a5fb5 (me/tutorial-rebase) fixup! tutorial
837 'rebase' and submitted a patch for review, so my original branch was just called
852 $ git rebase -i 5ca627b78\^
856 This begins an interactive 'rebase' where commit 5ca6427b78 is the earliest
858 commit before this one. The interactive 'rebase' command takes the last commit
867 [source,rebase]
890 file. If your 'rebase' results in a merge conflict, then you have probably
893 Perhaps a better name for the interactive 'rebase' command would be 'replay'. As
905 [source,rebase]
913 fixup 276edecab tutorial: Save changes before rebase
935 apart a commit. It is also possible using Git-rebase by marking a line with
952 type of 'rebase' and then try rebuilding and running the test.
959 $ git rebase master
963 +git rebase master+. You may find that after the rebase there is a merge
965 from a Makefile conflict which was caused by reordering commits in a 'rebase').
980 want, stage the changes and continue the 'rebase' with +git rebase