rkiel
|
c3079f1e1e
|
Revert "feature: handle merge conflicts on the feature branch not master"
This reverts commit d2498b699e.
|
2019-06-03 08:09:02 -04:00 |
|
rkiel
|
d2498b699e
|
feature: handle merge conflicts on the feature branch not master
|
2019-05-28 22:43:08 -04:00 |
|
rkiel
|
0015d4d0ff
|
updates: optimize rebase and merge
|
2019-01-30 21:51:39 -05:00 |
|
rkiel
|
209fcac14d
|
release: remove merge override
|
2017-09-20 22:33:13 -04:00 |
|
rkiel
|
9ff65e7e1e
|
release: added patch
|
2017-09-19 22:18:18 -04:00 |
|
Robert Kiel
|
ba44250fc2
|
added git_push_tags on merge
|
2017-01-21 20:18:57 -05:00 |
|
rkiel
|
218fa5a29c
|
adding-help: commit optimized tab completion and help
|
2015-06-07 21:38:20 -04:00 |
|