Category: Git SCM
-
git and credentials
https://git-scm.com/docs/gitcredentials https://git-scm.com/docs/git-credential-store
-
Git SCM: merge local master branch with remote master branch
https://stackoverflow.com/questions/18116198/merge-local-master-branch-with-remote-master-branch-in-git The “git pull remote master” did not work for me, I used “git pull origin master” instead (was this right?). https://stackoverflow.com/questions/16560095/git-pull-origin-master-branch-to-local-master-when-in-local-develop
-
Stack Overflow: find and restore a deleted file in a Git repository
https://stackoverflow.com/questions/953481/find-and-restore-a-deleted-file-in-a-git-repository Amongst all the suggestions there I had to find something, that fits my scenario. First find the commit ID, that includes the deletion of the resp. file (use either –summary or –raw!) (git log displays its output through $PAGER, presumably the utility less): $ git log –summary # find the file and the commit…
-
Git SCM: diff between two given tags
https://stackoverflow.com/questions/3211809/git-diff-between-given-two-tags A couple of interesting variants …
-
where do all those .gitkeep files come from? I did not create them
https://stackoverflow.com/questions/7229885/what-are-the-differences-between-gitignore-and-gitkeep So … I certainly have not ever created any .gitkeep in order to get Git to keep track of an empty directory. I rather suspect, that one of the utilities created them for me. I will observe that and report here later.
-
keeping my files (scripts, RC files, Rakefiles) in Git repos makes my life a lot easier
Of course it is essential, that those Git repos can be accessed from everywhere. https://github.com/JochenHayek/misc – my public Git repo my private Git repo resides on my NAS But I also have to acquire more Git skills. Luckily enough Git is “everywhere” (at home and at work), and I am able to exercise and study Git…
-
I let “Git Gui” AKA git-gui (on cygwin) “Compress Database”, and the database was corrupt then
https://git-scm.com/docs/git-gui The differences between the master and the local copy were not big enough, so I resorted to re-cloning: https://stackoverflow.com/questions/8271263/repair-corrupted-git-repository – I actually followed Niel de Wet’s advice (https://stackoverflow.com/users/297331/niel-de-wet) and “I simply replaced the .git folder in the broken repo with the one I recloned“
-
how to move files from one git repo to another (not a clone), preserving history
https://stackoverflow.com/questions/1365541/how-to-move-files-from-one-git-repo-to-another-not-a-clone-preserving-history http://gbayer.com/development/moving-files-from-one-git-repository-to-another-preserving-history/
-
my ‘git log’ shows plain ESC sequences – how to get this right?
http://git.661346.n2.nabble.com/git-log-escape-symbols-shown-as-ESC-33-and-ESC-m-td7602089.html https://stackoverflow.com/questions/25332598/how-to-suppress-display-of-escape-sequences-in-diff Until right now my LESS environment variable did not include “R” for passing through ANSI codes. Solutions: Either I add “R” explicitly, or I start git w/o LESS in its environment: $ env LESS=-MMiR git log $ env -u LESS git log
-
rcs2git using Perl, Ruby, AWK
https://github.com/knuta/rcs2git – using Perl https://github.com/JochenHayek/rcs2git – using Perl – I forked knuta’s version https://github.com/arnoldrobbins/simple-rcs2git – using AWK https://github.com/Oblomov/rcs-fast-export – using Ruby https://stackoverflow.com/questions/1619737/migrate-project-from-rcs-to-git