| commit | 7daca1a6b790bcd0a6ae224e489178d5623b5e18 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 7 Apr 2010 20:43:35 +0000 (7 22:43 +0200) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 7 Apr 2010 21:03:17 +0000 (7 23:03 +0200) | ||
| tree | 87327f418c7841ff9a9dd397c0b3916d160fa20b | treesnapshot (tar.gz zip) |
| parent | 872da1f3352f34f1a3c1e86a17018e5711350a41 | commitdiff |
Add a script to perform a 'rebasing merge' in /git/
A 'rebasing merge' is a rebased branch, but merging the original state
via the 'ours' strategy so that checkouts can be fast-forwarded easily.
Of course, a 'rebasing merge' should avoid to rebase commits incurred
by a previous 'rebasing merge'.
As our rebase target is junio/next, which itself is a frequently rebased
branch, we have special handling to exclude commits committed by known
non-msysGiticists.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A 'rebasing merge' is a rebased branch, but merging the original state
via the 'ours' strategy so that checkouts can be fast-forwarded easily.
Of course, a 'rebasing merge' should avoid to rebase commits incurred
by a previous 'rebasing merge'.
As our rebase target is junio/next, which itself is a frequently rebased
branch, we have special handling to exclude commits committed by known
non-msysGiticists.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| share/msysGit/rebasing-merge.sh | [new file with mode: 0644] | blob |