| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Instead of using git merge --no-ff which always ensure no conflict, try
to git merge covering simple cases (and automatically resolvable ones)
at the cost of a merge commit but abort in case of conflicts needing
manuable resolution.
|
| |
|
|
|
|
|
| |
Rename this command as their will be a new version failing in case of
conflict instead of duplicating conflicting files.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
fun things like this can be done:
tail -n2000 logfil.weechatlog | weechat-log2ansi | less -iR
|
| |
|
| |
|
| |
|
|
|