| commit | 742033ee55cb18d27794304971552c235e82b0df | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 16 Dec 2013 17:00:55 +0000 (16 11:00 -0600) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sat, 28 Dec 2013 00:02:04 +0000 (27 18:02 -0600) | ||
| tree | e835719cbd1a5d842627a4ab5eb70161c99cf895 | treesnapshot (tar.gz zip) |
| parent | 591433b9b909b7602fbf61a7cc60b5068f8f8ab7 | commitdiff |
shears.sh: make merge nicer to use
When modifying edit scripts, it is quite convenient to be able to
split branches by inserting
mark my-new-branch
rewind onto
and later just adding the line
merge my-new-branch
to make new merge commits from scratch, instead of calling a clunky
exec git merge --no-ff -m "Merge 'my-new-branch'" refs/rewritten/my-new-branch
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When modifying edit scripts, it is quite convenient to be able to
split branches by inserting
mark my-new-branch
rewind onto
and later just adding the line
merge my-new-branch
to make new merge commits from scratch, instead of calling a clunky
exec git merge --no-ff -m "Merge 'my-new-branch'" refs/rewritten/my-new-branch
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| share/msysGit/shears.sh | diffblobblamehistory |