| commit | 28d08e5f813903a3698e6428c0bd85b8129b04fa | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sat, 6 Aug 2011 10:22:23 +0000 (6 12:22 +0200) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sat, 6 Aug 2011 11:38:18 +0000 (6 13:38 +0200) | ||
| tree | 6cac3feeefa8c4b480d5421762445d8783f4ec3b | treesnapshot (tar.gz zip) |
| parent | e68531da7b32cca3013ea86f32c4bdc012a64bc7 | commitdiff |
rebasing-merge: specify all commits explicitly
The earlier attempt to specify additional commits included way too many
commits. So let's start to specify all of the commits explicitly.
While at it, refactor a little and offer a --graph mode that does not
perform the rebasing merge, but shows the commits to be rebased intead.
In the end, it looks like a complete rewrite of the logic, though.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The earlier attempt to specify additional commits included way too many
commits. So let's start to specify all of the commits explicitly.
While at it, refactor a little and offer a --graph mode that does not
perform the rebasing merge, but shows the commits to be rebased intead.
In the end, it looks like a complete rewrite of the logic, though.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| share/msysGit/rebasing-merge.sh | diffblobblamehistory |