diff --git a/README.rst b/README.rst index 04893c8..f28350a 100644 --- a/README.rst +++ b/README.rst @@ -58,4 +58,21 @@ Functional testing requires *geckodriver* and *selenium* which is a driver to pr +Toolings +-------- + +Few useful git aliases may be found in `gitalias.gitconfig` to use them add the include directive to your .git/config file + +.. code-block:: + + [include] + path = ../gitaliases.gitconfig + + [core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + + diff --git a/gitaliases.gitconfig b/gitaliases.gitconfig new file mode 100644 index 0000000..8d62732 --- /dev/null +++ b/gitaliases.gitconfig @@ -0,0 +1,12 @@ +# Add this to your .git/config file +#[include] +# path = ../gitaliases.gitconfig + +[alias] + um = "!git checkout main && git pull && git checkout - " + resync = "! git um && git rebase -" + out-of-sync = branch --no-merged main --no-contains main # Thee branch derive from an old main + open = branch --no-merged main --contains main + integ = "! git resync && git checkout main && git merge --no-ff - " + icm = "! echo 'ok'" +