diff options
| author | Karel Kočí <karel.koci@nic.cz> | 2017-09-19 13:33:41 +0200 |
|---|---|---|
| committer | Karel Kočí <karel.koci@nic.cz> | 2017-09-19 13:33:41 +0200 |
| commit | f7bbac700377968afce8fd86c8c9db294cfaaca2 (patch) | |
| tree | 53b6e372733552ffbbd4fbff1fbad1a389a7424d /shellrc | |
| parent | 2d69c702522a1dbcb467a0e9ec7c6e75dbda0291 (diff) | |
| download | myconfigs-f7bbac700377968afce8fd86c8c9db294cfaaca2.tar.gz myconfigs-f7bbac700377968afce8fd86c8c9db294cfaaca2.tar.bz2 myconfigs-f7bbac700377968afce8fd86c8c9db294cfaaca2.zip | |
Only allow ff in gitbmerge
Diffstat (limited to 'shellrc')
| -rw-r--r-- | shellrc | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -84,7 +84,7 @@ gitbmerge() { rm -r "$WT" git worktree prune fi - git merge "$1" && git push && git branch -d "$1" && git push origin :"$1" + git merge --ff-only "$1" && git push && git branch -d "$1" && git push origin :"$1" ) } |