diff options
author | Junio C Hamano <junio@kernel.org> | 2010-08-22 07:25:12 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-08-22 07:25:12 +0000 |
commit | 53ba6d09f50a1b19d435ff87db9145c7be66ef5d (patch) | |
tree | ce66dcc0aa8c168dfa43980be51862202b8669fa /git-rebase.txt | |
parent | d706dab3790376a88a890d43d4378ff3a02865ee (diff) | |
download | git-htmldocs-53ba6d09f50a1b19d435ff87db9145c7be66ef5d.tar.gz |
Autogenerated HTML docs for v1.7.2.2-162-g5cba1
Diffstat (limited to 'git-rebase.txt')
-rw-r--r-- | git-rebase.txt | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index b4314568f..3b87f1a1b 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -466,6 +466,30 @@ sure that the current HEAD is "B", and call $ git rebase -i -p --onto Q O ----------------------------- +Reordering and editing commits usually creates untested intermediate +steps. You may want to check that your history editing did not break +anything by running a test, or at least recompiling at intermediate +points in history by using the "exec" command (shortcut "x"). You may +do so by creating a todo list like this one: + +------------------------------------------- +pick deadbee Implement feature XXX +fixup f1a5c00 Fix to feature XXX +exec make +pick c0ffeee The oneline of the next commit +edit deadbab The oneline of the commit after +exec cd subdir; make test +... +------------------------------------------- + +The interactive rebase will stop when a command fails (i.e. exits with +non-0 status) to give you an opportunity to fix the problem. You can +continue with `git rebase --continue`. + +The "exec" command launches the command in a shell (the one specified +in `$SHELL`, or the default shell if `$SHELL` is not set), so you can +use shell features (like "cd", ">", ";" ...). The command is run from +the root of the working tree. SPLITTING COMMITS ----------------- |