diff options
| author | Hendrik Jäger <hendrik.jaeger@dswiss.com> | 2021-11-08 12:03:40 +0100 |
|---|---|---|
| committer | Hendrik Jäger <gitcommit@henk.geekmail.org> | 2021-12-21 13:38:22 +0100 |
| commit | fa0e6ada1816c53d7eafc00580686c3d5f5dae18 (patch) | |
| tree | fbd164c1777f3e454c206c1f0cf6dad1575c1bbe /.config/git | |
| parent | 956940b91a82ea31b7eef76a064224b590bd8f7f (diff) | |
Rebasing and merging is a common workflow
Diffstat (limited to '.config/git')
| -rw-r--r-- | .config/git/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index 3c47240..bfc11d3 100644 --- a/.config/git/config +++ b/.config/git/config @@ -129,6 +129,7 @@ rba = rebase --abort rbc = rebase --continue rbi = rebase --interactive + rbm = "!f() { git switch "$1" && git rebase - && git switch - && git merge -; }; f" r = reset r1 = reset HEAD^ |