diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2021-09-21 16:06:02 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2021-09-21 16:06:02 -0400 |
| commit | ef97d5c407757d2b190a576f1f86330db6be036d (patch) | |
| tree | f92604b59835c34085fa1d80953113db4f0c1afb /shazam-merge-template.example | |
| parent | d8937ede7064a74623a9d1ef260d5d50a146dd44 (diff) | |
| download | b4-ef97d5c407757d2b190a576f1f86330db6be036d.tar.gz | |
Add "b4 shazam" that is like b4 am + git am
By popular demand, provide a way to apply series straight to a git
repository. By default, we're still going the safest possible route:
- create a sparse worktree consisting just of the files being modified
- run "git am" against the temporary worktree
- if "git am" went well, fetch from the temporary worktree into our
current tree and leave everything in FETCH_HEAD
- unless we're running "b4 shazam -A" in which case we just apply to the
current HEAD (exact equivalent of b4 am -o- | git am)
Further changes to come based on feedback.
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Diffstat (limited to 'shazam-merge-template.example')
0 files changed, 0 insertions, 0 deletions