git

git stash single file

Snippet Yeah, kitt finished writing this at 13:20 on 31 May 2023

If you want to stash a single file, and not the whole change set. use --

Of note, this will stash staged changes, too, even if you dno't specify them in the --

$ git stash -- filename.ext

git add untracked files

Snippet Written with a loving hand by kitt some time around 20:01 on 21 March 2021

Add all untracked files with one command.

git ls-files -o --exclude-standard lists untracked files.

git add $(git ls-files -o --exclude-standard)

Short git version hash

Snippet Posted by kitt at 17:39 on 11 March 2021

Use rev-parse for the git hash, and the --short option for the short version of the hash.

# view the git hash of the last commit
$ git rev-parse HEAD 
1f0543ff172bdc5c5e90aac41c84103049f58390
 
# view the short git hash of the last commit 
$ git rev-parse --short HEAD
1f0543f

git commands

Snippet Instead of being asleep at 18:12 on 5 March 2019, kitt created this:

Bunch of git commands I use frequently.

# add all the modified files to staging
git add `git st | grep modified | cut -c14-120`
 
# add the removal all the deleted files from the repo to staging
git rm `git st | grep deleted | cut -c14-120`

git reset of a single file

Snippet Written with a loving hand by kitt some time around 11:16 on 18 December 2018

git reset will discard any local changes you have in the current branch you have checked out.

Sometimes, however, you want to reset a single file, not the whole branch. In this case, use checkout, but use the special "option" --, which is unix for "treat every argument after this point as a file name, no matter what it looks like."

# general case
git checkout HEAD -- [file]
 
# my specific case used ALL THE TIME
git checkout HEAD -- package-lock.json

Read more about git reset of a single file

Apply branch changes without merging with Git

Snippet Yeah, kitt finished writing this at 11:26 on 6 December 2018

You're working in one branch and you want the changes from another branch (say, you've done a pull request, and want the changes made in that other branch in your current branch), but don't want to merge the changes, you just want them available.

Assuming you want them all in one go, merge without committing, with a squash, then unstage the staged files that will come over with the merge.

If you want specific changes, use git cherrypick -n

git merge --no-commit --squash branch_with_commits
git reset HEAD

View Git Stash Contents Without Applying to Codebase

Snippet Yeah, kitt finished writing this at 06:14 on 30 November 2018

Use git stash list to view all stashes

Use git stash show with options to view a stash without applying it to the codebase.

# see a "git diff" of what's in the first stash 
git stash show -p stash@{0}

And, a shell script to view these. Save this into a file, chmod +x the file, and run in the terminal.

#!/bin/bash
 
readonly STASH="$1"
 
if [[ "xx${STASH}" != "xx" ]]; then
    git stash show -p stash@{${STASH}}
else
    git stash list
fi

Hide .git repo with Apache

Snippet Posted by kitt at 13:11 on 14 August 2018

Solution 2.

Don't allow apache to serve anything from the .git repo that might be in the DocumentRoot . This is great because it hides that there even IS a git repo on the webserver.

Add this to the .htaccess in the DocumentRoot after the RewriteEngine On line.

RedirectMatch 404 /\.git

Git remove from repo, keeping on file system

Snippet Instead of being asleep at 11:41 on 16 July 2017, kitt created this:

git rm will remove a file from the file system and the repository. If you want to keep the file locally (say, because you're adding it to the .gitignore file), remove it from the repository cache:

# for a file
git rm --cached filename
 
# for a directory
git rm --cached -r directoryname

Unstage a file in git

Snippet Yeah, kitt finished writing this at 18:40 on 22 November 2016

Add a file / directory to staging

git add filePath

Now, if you want to remove it from stage, but want to keep the changes you've made locally.

# unstage the file, remove it from the index, don't remove it from the working directory
# a commit will remove it from the repo
$ git rm --cached filePath
 
# unstage a file, keep the local changes
# YOU NORMALLY WANT THIS ONE
$ git reset filePath

git