<?xml version="1.0" encoding="UTF-8"?>
<!-- generator="FeedCreator 1.8" -->
<?xml-stylesheet href="http://192.168.180.206:8001/lib/exe/css.php?s=feed" type="text/css"?>
<rdf:RDF
    xmlns="http://purl.org/rss/1.0/"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
    xmlns:dc="http://purl.org/dc/elements/1.1/">
    <channel rdf:about="http://192.168.180.206:8001/feed.php">
        <title>wiki.niziak.spox.org - git</title>
        <description></description>
        <link>http://192.168.180.206:8001/</link>
        <image rdf:resource="http://192.168.180.206:8001/_media/wiki:dokuwiki.svg" />
       <dc:date>2026-05-12T21:58:08+00:00</dc:date>
        <items>
            <rdf:Seq>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:branches?rev=1735908473&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:cherry-pick?rev=1591175874&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:credentials_store?rev=1591175889&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:diff?rev=1591175784&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:gitlab?rev=1639129505&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:gitolite?rev=1588926370&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:google_repo?rev=1750423826&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:issues?rev=1689602558&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:merge?rev=1643971325&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:mirror?rev=1750069687&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:owndiff?rev=1643797505&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:patch?rev=1591175800&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:pgp?rev=1665046551&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:rewrite?rev=1712224065&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:split_merge_repos?rev=1705488536&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:staging?rev=1692688980&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:start?rev=1768892995&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:sub?rev=1765387688&amp;do=diff"/>
                <rdf:li rdf:resource="http://192.168.180.206:8001/git:tig?rev=1589542111&amp;do=diff"/>
            </rdf:Seq>
        </items>
    </channel>
    <image rdf:about="http://192.168.180.206:8001/_media/wiki:dokuwiki.svg">
        <title>wiki.niziak.spox.org</title>
        <link>http://192.168.180.206:8001/</link>
        <url>http://192.168.180.206:8001/_media/wiki:dokuwiki.svg</url>
    </image>
    <item rdf:about="http://192.168.180.206:8001/git:branches?rev=1735908473&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-01-03T12:47:53+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>branches</title>
        <link>http://192.168.180.206:8001/git:branches?rev=1735908473&amp;do=diff</link>
        <description>branches

remove remote tracking branch


git branch -d -r origin/feat/name


remove remote and local at once

	*  Removing git branches at once
	*  How do I delete a Git branch locally and remotely?</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:cherry-pick?rev=1591175874&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2020-06-03T09:17:54+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>chery-pick</title>
        <link>http://192.168.180.206:8001/git:cherry-pick?rev=1591175874&amp;do=diff</link>
        <description>chery-pick

cherry-pick from Gihub commit

Simply add .patch suffix to commit url to download patch file


https://github.com/contiki-os/contiki/commit/e4ccf4fcf7a9d1ea2c3854b43a440e768ba1dd40.patch
git am &lt; e4ccf4fcf7a9d1ea2c3854b43a440e768ba1dd40.patch</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:credentials_store?rev=1591175889&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2020-06-03T09:18:09+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>credentials store</title>
        <link>http://192.168.180.206:8001/git:credentials_store?rev=1591175889&amp;do=diff</link>
        <description>credentials store


git config --global credential.helper store
git config --unset --global credential.helper</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:diff?rev=1591175784&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2020-06-03T09:16:24+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>diff</title>
        <link>http://192.168.180.206:8001/git:diff?rev=1591175784&amp;do=diff</link>
        <description>diff

Word and LibreOffice documents

Trick is to convert document into text files and make diff on it.


sudo apt-get install odt2txt docx2txt
git config --global diff.odf.textconv &quot;odt2txt&quot;
git config --global diff.word.textconv &quot;docx2txt&quot;


Create file</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:gitlab?rev=1639129505&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2021-12-10T09:45:05+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>Gitlab</title>
        <link>http://192.168.180.206:8001/git:gitlab?rev=1639129505&amp;do=diff</link>
        <description>Gitlab

Download location: &lt;https://packages.gitlab.com/gitlab/gitlab-ce&gt; 

Archive versions: &lt;https://about.gitlab.com/downloads/archives/&gt; 

Configure Gitlab&#039;s web server: &lt;https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/nginx.md&gt; 


Get installed version info

gitlab-rake gitlab:env:info

See logs:


gitlab-ctl tail # all logs

tail -f /var/log/gitlab/gitlab-rails/production.log


gitlab-rake gitlab:app:check</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:gitolite?rev=1588926370&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2020-05-08T08:26:10+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>Gitolite</title>
        <link>http://192.168.180.206:8001/git:gitolite?rev=1588926370&amp;do=diff</link>
        <description>Gitolite

Installation

DEBIAN_PRIORITY=low apt-get install gitolite3

	*  System username for gitolite: git
	*  Repository path: /home/git/
	*  Administrator&#039;s SSH key: ssh-rsa ...

lost admin key/access

Log on to the server, and run 

gitolite setup -pk alice.pub</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:google_repo?rev=1750423826&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-06-20T12:50:26+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>google repo tool</title>
        <link>http://192.168.180.206:8001/git:google_repo?rev=1750423826&amp;do=diff</link>
        <description>google repo tool

manifest

replace project


&lt;manifest&gt;
    &lt;!-- add github as a remote source --&gt;
    &lt;remote name=&quot;github&quot; fetch=&quot;git://github.com&quot; /&gt;

    &lt;remove-project name=&quot;platform/bootable/recovery&quot; /&gt;
    &lt;project path=&quot;bootable/recovery&quot; name=&quot;CyanogenMod/android_bootable_recovery&quot; remote=&quot;github&quot; revision=&quot;cm-10.1&quot; /&gt;
&lt;/manifest&gt;</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:issues?rev=1689602558&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2023-07-17T14:02:38+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>Issues</title>
        <link>http://192.168.180.206:8001/git:issues?rev=1689602558&amp;do=diff</link>
        <description>Issues

fsck: dangling commit

List details about dangling commits (Git – Finding Lost/Dangling Commits:


git fsck --lost-found | grep &quot;^dangling commit&quot; | sed &quot;s/^dangling commit //g&quot; | xargs git show -s --oneline


Cleanup:


git reflog expire --expire=now --all
git gc --prune=now --aggressive
git repack -a -d</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:merge?rev=1643971325&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2022-02-04T10:42:05+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>merge</title>
        <link>http://192.168.180.206:8001/git:merge?rev=1643971325&amp;do=diff</link>
        <description>merge

merge conflicts


git checkout --ours PATH/FILE
git checkout --theirs PATH/FILE</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:mirror?rev=1750069687&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-06-16T10:28:07+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>mirrors</title>
        <link>http://192.168.180.206:8001/git:mirror?rev=1750069687&amp;do=diff</link>
        <description>mirrors

Light git mirrors hosting:

	*  &lt;https://github.com/sibwaf/gire&gt;
	*  &lt;https://wbrawner.com/2019/02/16/a-simple-self-hosted-git-server/&gt;

Backup:

	*  &lt;https://cooperspencer.github.io/gickup-documentation/&gt;</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:owndiff?rev=1643797505&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2022-02-02T10:25:05+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>own diff/mergetool</title>
        <link>http://192.168.180.206:8001/git:owndiff?rev=1643797505&amp;do=diff</link>
        <description>own diff/mergetool

	*  Git merge with git-crypt
	*  Creating your own git mergetool
	*  Git Smudge and Clean Filters: Making Changes So You Don’t Have To
	*  gitattributes
	*  8.2 Customizing Git - Git Attributes</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:patch?rev=1591175800&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2020-06-03T09:16:40+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>patch</title>
        <link>http://192.168.180.206:8001/git:patch?rev=1591175800&amp;do=diff</link>
        <description>patch

Applying

Check and apply the patch:


git apply --stat fix_empty_poster.patch
git apply --check fix_empty_poster.patch
git am --signoff &lt; fix_empty_poster.patch


Create

last commit

git format-patch -1

current branch and master branch

git format-patch gitlab/master --stdout</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:pgp?rev=1665046551&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2022-10-06T08:55:51+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>signing git commits</title>
        <link>http://192.168.180.206:8001/git:pgp?rev=1665046551&amp;do=diff</link>
        <description>signing git commits

See gpg-agent forwarding


git config --global user.signingkey XXXXXXXXXXXXX


Enable signing of each commit by default:


git config --global commit.gpgsign true


signing and verifying


git verify commit &lt;HASH&gt;

gpg:                using RSA key XXXXXXXXXX
gpg: Good signature from &quot;User &lt;user@example.com&gt;&quot; [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg:          There is no indication that the signature belongs to the owner.
Primary key fi…</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:rewrite?rev=1712224065&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2024-04-04T09:47:45+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>Rewrite history</title>
        <link>http://192.168.180.206:8001/git:rewrite?rev=1712224065&amp;do=diff</link>
        <description>Rewrite history

change initial commit


git rebase -i --root


reformat code in commits

git rebase


git rebase main -x &#039;make clang-reformat &amp;&amp; git commit --amend&#039;


git-filter-repo


wget https://raw.githubusercontent.com/newren/git-filter-repo/main/contrib/filter-repo-demos/lint-history
chmod +x lint-history</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:split_merge_repos?rev=1705488536&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2024-01-17T10:48:56+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>Split or merge repos</title>
        <link>http://192.168.180.206:8001/git:split_merge_repos?rev=1705488536&amp;do=diff</link>
        <description>Split or merge repos

Merge repos into one

subtree add

Adding remote repos as subtrees results in merges in history, which cannot be rebased to get flat history.
Rebasing causes to subtree appear in main repo root directory instead of subdirectory. Better use next method
with moving files manually.</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:staging?rev=1692688980&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2023-08-22T07:23:00+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>staging</title>
        <link>http://192.168.180.206:8001/git:staging?rev=1692688980&amp;do=diff</link>
        <description>staging

interactive staging


git add -i -p file.c


	*  -i or --interactive for interactive
	*  -p or --patch interactively choose hunks</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:start?rev=1768892995&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2026-01-20T07:09:55+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>GIT</title>
        <link>http://192.168.180.206:8001/git:start?rev=1768892995&amp;do=diff</link>
        <description>GIT

Preparation

bash completion

A1.6 Appendix A: Git in Other Environments - Git in Bash

Package git contains:


/etc/bash_completion.d/git-prompt
/usr/share/bash-completion/completions/git
/usr/share/bash-completion/completions/gitk



. /usr/share/bash-completion/completions/git
. /usr/lib/git-core/git-sh-prompt

if [ &quot;$color_prompt&quot; = yes ]; then
#   PS1=&#039;${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ &#039;
    PS1=&#039;${debian_chroot:+($debian…</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:sub?rev=1765387688&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-12-10T17:28:08+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>submodules</title>
        <link>http://192.168.180.206:8001/git:sub?rev=1765387688&amp;do=diff</link>
        <description>&lt;https://andrey.nering.com.br/2016/git-submodules-vs-subtrees/&gt;

submodules

Submodule is only a link to commit ref in another repo.

Add

Adding submodule:


git submodule add &lt;repository&gt; [&lt;relative_local_path&gt;]


Init

After cloning master repo with submodules:


git submodule init
git submodule update


alternatively repo can be clonned with</description>
    </item>
    <item rdf:about="http://192.168.180.206:8001/git:tig?rev=1589542111&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2020-05-15T11:28:31+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>TIG</title>
        <link>http://192.168.180.206:8001/git:tig?rev=1589542111&amp;do=diff</link>
        <description>TIG

follow renames

tig --follow file.c

format patch

&lt;file | $HOME/.tigrc&gt;
bind generic E !git format-patch -1 %(commit)
&lt;file&gt;
now press SHIFT+e to generate patch file</description>
    </item>
</rdf:RDF>
