Have you ever used cd -?
~/code/ $ cd scripts
~/code/scripts $ cd -
~/code/ $You can do the same thing with git switch -! (you can use checkout too, but switch is a more specific command)
~/code/repo/ (master) $ git switch develop
~/code/repo/ (develop) $ git switch -
~/code/repo/ (master) $More compact status with less hints.
I alias this to gs.
~/c/clint (develop) $ git status -sb
## develop...origin/develop [behind 46]
D manage.py
M requirements.txtTakes a commit or a range of commits and copies them onto your current branch.
I use this most commonly to get a single commit from another branch or from the reflog.
$ git cherry-pick razzi/3791Remove untracked files (DANGEROUS but if you still have them open in your editor you can recover them; thanks emacs buffers!)
~/c/clint (develop) $ git checkout .
~/c/clint (develop) $ gs
## develop...origin/develop [behind 46]
?? webapp/apps/solar/system/migrations/0010_auto_20170404_1536.py
?? webapp/apps/solar/system/migrations/0011_solarsite_utility_calculation_source.py
~/c/clint (develop) $ git clean -f
Removing webapp/apps/solar/system/migrations/0010_auto_20170404_1536.py
Removing webapp/apps/solar/system/migrations/0011_solarsite_utility_calculation_source.py
~/c/clint (develop) $ django-admin makemigrations
Imagine @towens2727 branches off of develop and makes a commit. So do I.
Later, @towens2727's commit is merged into develop.
Now, I have to merge develop into my branch if any conflicts arise.
Legend: o = commit
m = merge commit
o--to/dev-
/ \
dev -o------------m---m
\ \ /
o-razzi/dev--m
Wouldn't the world be simpler if before doing any work myself, I waited for @towens2727 to merge all his code back into develop?
o--to/dev--
/ \
dev -o-------------m--------------m
\ /
o-razzi/dev-
1 less merge commit!
How can we accomplish this without restricting development to one developer at a time?
Rebasing!
~/code/clint (razzi/ur-68) $ git rebase develop
lib/template/utils.py | 43 ++++++++-----
requirements.txt | 1 -
2 files changed, 24 insertions(+), 20 deletions(-)
First, rewinding head to replay your work on top of it...
Applying: [UR-68] Add script to compare utility calculation accuracy
Applying: Make percent a percent rather than a ratio
First, rebase rewinds your current branch to the point where you and the given branch diverged.
Then, starting from the given branch, it replays your commits.
It's as though you waited for that branch to get to its current state before you started committing!
Commits made this way will have a new commit id, so if you had already pushed commits to that branch on a remote, you'll need to force push.
By default, it doesn't show stats (unlike merge). But this is just a git setting away:
$ git config --global rebase.stat truegit push --force will update a remote's branch to be where your local branch is, even if remote has commits you don't have. This is useful when you amend a commit locally - the old commit has is gone - but can also destroy commits on that branch that others have pushed.
Fortunately, if you run git push --force-with-lease, the force push will be cancelled if remote has commits that you haven't fetched, which will stop you from destroying work you're unaware of. I recommend always using this option instead of git push --force, so I alias gpf to git push --force-with-lease.
Git stores settings in 2 places: .git/config for the local repository and ~/.gitconfig for global settings.
Local .git/config is usually just stuff like remotes. Look here to debug why remotes aren't working properly.
~/.gitconfig stores personal configuration, aliases, and other preferences.
[alias]
# Simple abbreviation
cl = clone
# Staged changes
new = diff --cached
# Current branch name
current = rev-parse --abbrev-ref HEAD
Here's a command I use a lot to reset the current branch to the origin:
$ git reset --hard origin/(git current)
# Make `git pull` a fetch + rebase rather than fetch + merge
[pull]
rebase = true
# Show stats when rebasing
[rebase]
stat = true
# Additional file patters to ignore
[core]
excludesfile = ~/.gitignore_global
A couple snippets from my .gitignore_global:
*~undo-tree~
.cache
This is handy for editor-specific files and things you don't want to bother with in every repository.
Pro tip: track your global gitconfig in git! Here's mine.
git rebase -i develop
takes you to an interactive edit session where you can edit your commit history:
pick 6d162c4904 [UR-68] Add script to compare utility calculation accuracy
fixup c259d4e9ff fix typo
drop f66924000b remove all redis model properties
Here I'm using fixup to combine 2 commits, one of which is just fixing a typo.
Note: you can also git commit --amend if the typo happened on the most recent commit.
I'm also dropping an overly ambitious commit where I've digressed too far.
The editor has helpful hints!
pick 6d162c4904 [UR-68] Add script to compare utility calculation accuracy
pick 0bc6414728 Make percent actually a percent rather than a ratio
# Rebase 6d162c4904..0bc6414728 onto 6deae34b4d (2 commands)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out
Now that we've seen we can drop commits (maybe a little too) easily, let's look at git reflog, which makes it really hard to lose work.
530db754cd HEAD@{154}: commit: Pass both pre and post solar custom rates to the custom rate schedule calculator
3e3266973c HEAD@{155}: checkout: moving from master to razzi/custom_rate_fix
3e3266973c HEAD@{156}: checkout: moving from staging to master
9999d17683 HEAD@{159}: rebase finished: returning to refs/heads/staging
9999d17683 HEAD@{160}: pull: checkout 9999d176830131409b6891b72d1c968bdcc3dfdd
193c5ae0a8 HEAD@{161}: reset: moving to origin/staging
e3719bbfdd HEAD@{162}: checkout: moving from razzi/5344 to staging
Even if I drop these commits, they're still reachable in my local .git history.
Even if I delete the branch that the above commit was on, I can still cherry-pick it a year later.
Checkouts, commits, rebases, and resets are tracked in the reflog.
As long as work is ever committed, you can find it in the reflog.
Sort of like how git rebase -i opens an editor of git commits, git add -p interactively goes through unstaged changes. You can press y to state, n to not stage, and e to edit the patch!
$ git add -p
diff --git a/README.md b/README.md
index 0edf6f3..263bebb 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,8 @@ Takes a commit or a range of commits and copies them onto your current branch.
I use this most commonly to get a single commit from another branch or from the reflog.
-git cherry-pick razzi/3791
+$ git cherry-pick razzi/3791
Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]? yThis command helps find the commit that introduced some bug by marking a known good commit (perhaps master) and a known bad commit (probably HEAD) then letting git bisect the commits between them.
~/c/clint (develop) $ git bisect good master
You need to start by "git bisect start"
Do you want me to do it for you [Y/n]? y
~/c/clint (develop|BISECTING) $ git bisect bad
Bisecting: 73 revisions left to test after this (roughly 6 steps)
[7da829fe6bcf4bc5c6a8d09ea028f8596f5e9b2c] Fix usage_profile_id copypasta
~/c/clint ((7da829fe…)|BISECTING) $ # Check the ui for some bug... no bug at this commit.
~/c/clint ((7da829fe…)|BISECTING) $ git bisect good
Bisecting: 36 revisions left to test after this (roughly 5 steps)``
...
If you want to end early, git bisect reset.
Rather than stashing, I use WIP commits so that changes are associated with the proper branch, rather than being in a global stash.
$ function wip
git add .
git commit -m "wip $argv"
endI also have a shortcut for @ to git reset @^ to undo the WIP commit.
hub is a command line program for interacting with github.
It provides commands like pull-request, which creates a pull request from your current branch.
$ hub pull-request
...
UR-68 Utility Comparison Script
Also moved all utility scripts to one directory.
# Requesting a pull to sighten:develop from sighten:razzi/ur-68
#
# Write a message for this pull request. The first block
# of text is the title and the rest is the description.
#
# Changes:
#
# 011d1aaf4b (Razzi Abuissa, 9 hours ago)
# Make percent actually a percent
...
https://github.com/sighten/clint/pull/1234It also wraps every existing git command, so they recommend you alias git to hub.
Show what commands git is running. Useful for debugging aliases and hooks.
~/c/clint (razzi/ur-68) $ export GIT_TRACE=1
~/c/clint (razzi/ur-68) $ gs
00:05:36.091823 git.c:371 trace: built-in: git 'status' '-sb'
## razzi/ur-68...origin/razzi/ur-68For example: where is that "hi" message coming from?
~/c/clint (razzi/ur-68) $ git checkout develop
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
hi
~/c/clint (develop) $ set -xg GIT_TRACE 1
~/c/clint (develop) $ git checkout -
00:09:53.905261 git.c:371 trace: built-in: git 'checkout' '-'
Switched to branch 'razzi/ur-68'
Your branch is up-to-date with 'origin/razzi/ur-68'.
00:09:54.026583 run-command.c:369 trace: run_command: '.git/hooks/post-checkout' '6deae34b4d93fcadd14286b023bfcdb8d7eba2c0' '011d1aaf4bdeb262c78747b0783febc5f2f6d8ab' '1'
hi
It's coming from .git/hooks/post-checkout!
~/f/git-tricks (master) $ gs
## Initial commit on master
?? README.md
~/f/git-tricks (master) $ ga
~/f/git-tricks (master) $ gc Add git tricks
[master (root-commit) b88fa03] Add git tricks
1 file changed, 356 insertions(+)
create mode 100644 README.md
~/f/git-tricks (master) $ git push
fatal: No configured push destination.
Either specify the URL from the command-line or configure a remote repository using
git remote add <name> <url>
and then push using the remote name
git push <name>
~/f/git-tricks (master) $ hub create
Updating origin
created repository: razzius/git-tricks
~/f/git-tricks (master) $ git push
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 4.38 KiB | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:razzius/git-tricks.git
* [new branch] master -> master