| commit | f9897b83d10a08fc5218d891f7dd8c8b3d0e168e | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 25 Jan 2009 19:58:13 +0000 (25 20:58 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 7 Feb 2010 21:49:55 +0000 (7 22:49 +0100) | ||
| tree | 657689d3e4797863fe34352bb111e0ce3a248532 | treesnapshot (tar.gz zip) |
| parent | e62ee09f631c3e29f6d773b8998f3d69f9b59681 | commitdiff |
WIP: split DROPPED part to its own commit! rebase -i -p: use patch-id directly to determine the dropped commits
We need to find out which commits were dropped by --cherry-pick, and
which commits they correspond to.
As before, we substitute the dropped commits by their parents.
If the dropped commit has no parent, it is the root commit, whose
new parent is the commit we are rebasing onto.
While at it, we record the information in "$REWRITTEN" instead of
"$DROPPED", as there is no semantical difference in their usage.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We need to find out which commits were dropped by --cherry-pick, and
which commits they correspond to.
As before, we substitute the dropped commits by their parents.
If the dropped commit has no parent, it is the root commit, whose
new parent is the commit we are rebasing onto.
While at it, we record the information in "$REWRITTEN" instead of
"$DROPPED", as there is no semantical difference in their usage.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| git-rebase--interactive.sh | diffblobblamehistory |