Commit part of a file in git:

You can use git add --patch <filename> (or -p for short), and git will begin to break down your file into what it thinks are sensible hunks (portions of the file). It will then prompt you with this question:

Stage this hunk [y,n,q,a,d,/,j,J,g,s,e,?]?

Here is a description of each option:
y stage this hunk for the next commit
n do not stage this hunk for the next commit
q quit; do not stage this hunk or any of the remaining hunks
a stage this hunk and all later hunks in the file
d do not stage this hunk or any of the later hunks in the file
g select a hunk to go to
/ search for a hunk matching the given regex
j leave this hunk undecided, see next undecided hunk
J leave this hunk undecided, see next hunk
k leave this hunk undecided, see previous undecided hunk
K leave this hunk undecided, see previous hunk
s split the current hunk into smaller hunks
e manually edit the current hunk

#git #patch #commit #hunk #stage #git_add #git_add_patch

https://gist.github.com/pixelsonly/fabfa0245beccdf7d138

#git #zsh #oh_my_zsh #commands

Did you push a very large file into git? Does everyone yell at you about your commit and your uselessness? Are you a junky punky like me that just ruin things? Oh I'm kidding...

Because of that big file cloning the repo again would take a long long time. Removing the file locally and pushing again would not solve the problem as that big file is in Git's history.

If you want to remove the large file from your git history, so that when everyone clone the repo should not wait for that large file, just do as follow:

git filter-branch --tree-filter 'rm path/to/your/bigfile' HEAD

 git push origin master --force

I should note that you should be in the root of git repo.

If you need to do this, be sure to keep a copy of your repo around in case something goes wrong.

#git #clone #rm #remove #large_file #blob #rebase #filter_branch

I usually use linux copy command cp to copy files from my project into a production environment project. I copied wrong files by accident from a different repo into production environment and messed up the repo. Some files got into modified state, many untracked
files added into the project.

To revert all the C**P and make a clean slate of your project again, you just need to do 2 things:

1- git checkout .

2- git clean -f


First command will revert all modified files into their previous state. Second one will remove all untracked files.

Happy copying :)

#git #revert #checkout #clean #git_clean

If you have untracked directories not files then rather than using git clean -f use git clean -d. So if you want to clean both:

git clean -df

#git #clean #untrack

Have you had a chance to work with Git? If so, did you know that you can work with your git repository from within python script?

GitPython python library does exactly this job:

http://gitpython.readthedocs.io/en/stable/

#python #git #push #pull #GitPython

Few days ago we talk about gitPython to work with git inside of python. The code below is a sample that would do all routine tasks like pulling and pushing or commit.

1- Initiate git object in python by providing path:

from git import Repo
 repo = Repo(repo_path)

2- If you want to pull results from git repo:

repo.git.pull('origin', 'refs/heads/dev')

3- Let's say you want to set username and email for git author:

config = repo.config_writer()
 config.set_value("user", "email", author_email)
 config.set_value("user", "name", author_name)

4- Now to add a specific file to staged:

index = repo.index
 index.add([file_path])

5- Commit the staged file with a message:

index.commit(commit_message)

6- The final step is to push to a remote repo:

repo.git.push('origin', 'refs/heads/dev')

#python #git #gitPython #pull #push #author

https://stackoverflow.com/questions/4309156/commit-specific-lines-of-a-file-to-git?utm_medium=organic&utm_source=google_rich_qa&utm_campaign=google_rich_qa

#git #commit

I sometimes forgot to pull data from git before start working on a project. To minimize the headache of merge conflict or having to reset head and stash your data you can set a cronjob to run every 10 minute or so. And inside of your bash script CD into eaach of your folders and issue git pull command.

If you have similar issues and you're solving it in a different manner, I'd be happy to hear about it. :)

#linux #mac #bash #script #git #cron #crontab #cronjob

If you forget to pull your projects from git in a regular interval and many users working on the same projects, then there is a solution for you!

Create a bash script file as follow and make it executable by chmod +x puller.sh:

puller.sh file content:

#!/bin/bash

 echo 'Iterating over folders...'
 for dir in *
 do
   test -d "$dir" && {
       cd ${dir}
       echo "git pull $dir"
       git pull
       cd ".."
   } || {
       echo "------> $dir is not a directory <-------"
   }
 done

NOTE: this file should reside in your folder's project root. In my case it is in /Your/Projects/Folder.

Now as a final step, put it in your crontab:

10 * * * * bash -c "cd /Your/Projects/Folder; bash puller.sh >> /var/log/git_pull_output.log"

#linux #git #pull #cronjob #crontab #cron #bash

How to delete a git branch?

https://makandracards.com/makandra/621-git-delete-a-branch-local-or-remote

#git #branch #delete

Install & configure gitlab-runner:

https://gist.github.com/muellermarkus/76a02f6fa46206d4ec61c5c0af9f357c

#gitlab #git #runner #runner #gitlab_runner #script #sh #gist #github

In order to checkout all files in a project in GIT:

git checkout -- .

#git #checkout

https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

#git #git_rebase #rebase

https://stackoverflow.com/questions/18770545/why-is-my-git-submodule-head-detached-from-master

#stackoverflow #git #submodule