$ git checkout c652b6b Note: checking out 'c652b6b'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b HEAD is now at c652b6b... Add kubernetes setup to fish shell.
alias g='git' alias gaa='git add -A' alias gb='git branch' alias gc='git commit' alias gco='git checkout' alias gd='git diff' alias gglr='git pull --rebase' alias ggp='git push' alias gst='git status'
alias ibase='git rebase -i $(git merge-base HEAD master)' alias gpr='git pull-request -o' alias gcm='git remote show origin \ | awk '/HEAD branch:/ {print \$3}' \ | xargs git checkout'
λ git bisect bad 6fb10e5ec916063e4b4bd744678559afb45d6791 is the first bad commit commit 6fb10e5ec916063e4b4bd744678559afb45d6791 Author: Aaron Renner Date: Tue May 2 07:55:01 2017 -0600 Fix leaking webdriver sessions in QueryTest (#209) Wallaby.Integration.QueryTest was starting a ton of sessions and not cleaning them up. This switches it over to use Wallaby.Integration.SessionCase and uses the session that's automatically created and cleaned up. I also extracted the unit tests out of this integration test so they can be run separately.
λ git rebase master First, rewinding head to replay your work on top of it... Applying: My Fancy Fix Using index info to reconstruct a base tree... M README.md Falling back to patching base and 3-way merge... Auto-merging README.md CONFLICT (content): Merge conflict in README.md error: Failed to merge in the changes. Patch failed at 0001 WIP The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".
λ git rebase master First, rewinding head to replay your work on top of it... Applying: My Fancy Fix Using index info to reconstruct a base tree... M README.md Falling back to patching base and 3-way merge... Auto-merging README.md CONFLICT (content): Merge conflict in README.md error: Failed to merge in the changes. Patch failed at 0001 WIP The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".
λ mix test 1) test it works (Metaform.Web.PageViewTest) test/web/views/page_view_test.exs:4 This is broken now stacktrace: test/web/views/page_view_test.exs:5: (test) .... Finished in 0.1 seconds 5 tests, 1 failure
f1b1 HEAD@{0}: rebase -i (finish): returning to refs/heads/chores/remove-select 677f1b1 HEAD@{1}: rebase -i (pick): Update new file f55b0d8 HEAD@{2}: cherry-pick: fast-forward f4b7d8b HEAD@{3}: rebase -i (start): checkout HEAD~3 ca47093 HEAD@{4}: commit: Update new file 039d19a HEAD@{5}: commit (amend): My super important commit don't loose this. 62fc606 HEAD@{6}: rebase -i (finish): returning to refs/heads/chores/remove-select
f1b1 HEAD@{0}: rebase -i (finish): returning to refs/heads/chores/remove-select 677f1b1 HEAD@{1}: rebase -i (pick): Update new file f55b0d8 HEAD@{2}: cherry-pick: fast-forward f4b7d8b HEAD@{3}: rebase -i (start): checkout HEAD~3 ca47093 HEAD@{4}: commit: Update new file 039d19a HEAD@{5}: commit (amend): My super important commit don't loose this. 62fc606 HEAD@{6}: rebase -i (finish): returning to refs/heads/chores/remove-select