1

(main)$ git show

1

$ git log -n1 -p

1

$ git commit --amend --only

1

$ git commit --amend --only -m 'xxxxxxx'

1

$ git commit --amend --author "New Authorname <authoremail@mydomain.com>"

1
2
3

$ git checkout HEAD^ myfile
$ git add -A
$ git commit --amend

1
2

$ git reset HEAD^ --hard
$ git push -f [remote] [branch]

1

(my-branch*)$ git reset --soft HEAD@{1}

1
2

$ git rebase --onto SHA1_OF_BAD_COMMIT^ SHA1_OF_BAD_COMMIT
$ git push -f [remote] [branch]

1
2
3
4
5
6
7

To https://github.com/yourusername/repo.git
! [rejected]        mybranch -> mybranch (non-fast-forward)
error: failed to push some refs to 'https://github.com/tanay1337/webmaker.org.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

1

(my-branch)$ git push origin mybranch -f

1

(main)$ git reflog

1

(main)$ git reset --hard SHA1234

1

(my-branch*)$ git commit --amend

1

$ git add --patch filename.x

1

$ git add -N filename.x

1
2
3
4
5

$ git commit -m "WIP"
$ git add .
$ git stash
$ git reset HEAD^
$ git stash pop --index 0

1

$ git checkout -b my-branch

1
2
3

$ git stash
$ git checkout my-branch
$ git stash pop

1
2
3
4
5
6
7
8

# one commit
(my-branch)$ git reset --hard HEAD^
# two commits
(my-branch)$ git reset --hard HEAD^^
# four commits
(my-branch)$ git reset --hard HEAD~4
# or
(main)$ git checkout -f

1

$ git reset filename

1
2

$ git checkout -p
# Answer y to all of the snippets you want to drop

1
2
3
4

$ git stash -p
# Select all of the snippets you want to save
$ git reset --hard
$ git stash pop

1
2
3

$ git stash -p
# Select all of the snippets you don't want to save
$ git stash drop

1
2
3

(main)$ git reflog
ab7555f HEAD@{0}: pull origin wrong-branch: Fast-forward
c5bc55a HEAD@{1}: checkout: checkout message goes here

1

$ git reset --hard c5bc55a

1
2
3
4
5

(my-branch)$ git status
# On branch my-branch
# Your branch is ahead of 'origin/my-branch' by 2 commits.
#   (use "git push" to publish your local commits)
#

1

(main)$ git reset --hard origin/my-branch

1

(main)$ git branch my-branch

1

(main)$ git reset --hard HEAD^

1
2

(main)$ git reset --hard a13b85e
HEAD is now at a13b85e

1

(main)$ git checkout my-branch

1

(solution)$ git add -A && git commit -m "Adding all changes from this spike into one big commit."

1

(develop)$ git checkout solution -- file1.txt

1
2
3
4
5
6

# On branch develop
# Your branch is up-to-date with 'origin/develop'.
# Changes to be committed:
#  (use "git reset HEAD <file>..." to unstage)
#
#        modified:   file1.txt

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

(main)$ git log
commit e3851e817c451cc36f2e6f3049db528415e3c114
Author: Alex Lee <alexlee@example.com>
Date:   Tue Jul 22 15:39:27 2014 -0400
    Bug #21 - Added CSRF protection
commit 5ea51731d150f7ddc4a365437931cd8be3bf3131
Author: Alex Lee <alexlee@example.com>
Date:   Tue Jul 22 15:39:12 2014 -0400
    Bug #14 - Fixed spacing on title
commit a13b85e984171c6e2a1729bb061994525f626d14
Author: Aki Rose <akirose@example.com>
Date:   Tue Jul 21 01:12:48 2014 -0400
    First commit

1
2

(main)$ git reset --hard a13b85e
HEAD is now at a13b85e

1
2

(main)$ git checkout -b 21
(21)$

1

(21)$ git cherry-pick e3851e8

1
2
3

(21)$ git checkout main
(main)$ git checkout -b 14
(14)$

1

(14)$ git cherry-pick 5ea5173

1

$ git fetch -p

1
2
3
4
5

(main)$ git checkout -b my-branch
(my-branch)$ git branch
(my-branch)$ touch foo.txt
(my-branch)$ ls
README.md foo.txt

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

(my-branch)$ git add .
(my-branch)$ git commit -m 'foo.txt added'
(my-branch)$ foo.txt added
 1 files changed, 1 insertions(+)
 create mode 100644 foo.txt
(my-branch)$ git log
commit 4e3cd85a670ced7cc17a2b5d8d3d809ac88d5012
Author: siemiatj <siemiatj@example.com>
Date:   Wed Jul 30 00:34:10 2014 +0200
    foo.txt added
commit 69204cdf0acbab201619d95ad8295928e7f411d5
Author: Kate Hudson <katehudson@example.com>
Date:   Tue Jul 29 13:14:46 2014 -0400
    Fixes #6: Force pushing after amending commits

1
2
3
4
5
6
7

(my-branch)$ git checkout main
Switched to branch 'main'
Your branch is up-to-date with 'origin/main'.
(main)$ git branch -D my-branch
Deleted branch my-branch (was 4e3cd85).
(main)$ echo oh noes, deleted my branch!
oh noes, deleted my branch!

1
2
3
4

(main)$ git reflog
69204cd HEAD@{0}: checkout: moving from my-branch to main
4e3cd85 HEAD@{1}: commit: foo.txt added
69204cd HEAD@{2}: checkout: moving from main to my-branch

1
2
3
4
5
6

(main)$ git checkout -b my-branch-help
Switched to a new branch 'my-branch-help'
(my-branch-help)$ git reset --hard 4e3cd85
HEAD is now at 4e3cd85 foo.txt added
(my-branch-help)$ ls
README.md foo.txt

1

(main)$ git push origin --delete my-branch

1

(main)$ git push origin :my-branch

1

(main)$ git branch -D my-branch

1

(main)$ git fetch --all

1
2
3

(main)$ git checkout --track origin/daves
Branch daves set up to track remote branch daves from origin.
Switched to a new branch 'daves'

1

(my-branch)$ git reset --hard ORIG_HEAD

1
2
3
4

(main)$ git checkout my-branch
(my-branch)$ git rebase -i main
(my-branch)$ git checkout main
(main)$ git merge --ff-only my-branch

1
2

(my-branch)$ git reset --soft main
(my-branch)$ git commit -am "New awesome feature"

1

(my-branch)$ git rebase -i main

1

(main)$ git rebase -i HEAD~2

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21

pick a9c8a1d Some refactoring
pick 01b2fd8 New awesome feature
pick b729ad5 fixup
pick e3851e8 another fix
# Rebase 8074d12..b729ad5 onto 8074d12
#
# 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
#
# 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

1
2
3
4

pick a9c8a1d Some refactoring
pick 01b2fd8 New awesome feature
f b729ad5 fixup
f e3851e8 another fix

1
2
3
4

pick a9c8a1d Some refactoring
pick 01b2fd8 New awesome feature
s b729ad5 fixup
s e3851e8 another fix

1
2
3
4
5
6
7
8
9

Newer, awesomer features
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# rebase in progress; onto 8074d12
# You are currently editing a commit while rebasing branch 'main' on '8074d12'.
#
# Changes to be committed:
#	modified:   README.md
#

1

(main)$ Successfully rebased and updated refs/heads/main.

1

(main)$ git merge --no-ff --no-commit my-branch

1

(main)$ git merge --squash my-branch

1

(main)$ git rebase -i @{u}

1

(main)$ git log --graph --left-right --cherry-pick --oneline HEAD...feature/120-on-scroll

1

(main)$ git log main ^feature/120-on-scroll --no-merges

1

noop

1
2
3
4
5
6

(my-branch)$ git status
On branch my-branch
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
	modified:   README.md

1
2
3
4
5

   <<<<<<< HEAD
   some code
   =========
   some code
   >>>>>>> new-commit

1

(main*)$ git mergetool -t opendiff

1
2

(my-branch)$ git add README.md
(my-branch)$ git rebase --continue

1

(my-branch)$ git rebase --abort

1

$ git stash

1

$ git stash -u

1

$ git stash push working-directory-path/filename.ext

1

$ git stash push working-directory-path/filename1.ext working-directory-path/filename2.ext

1

$ git stash save <message>

1

$ git stash push -m <message>

1

$ git stash list

1

$ git stash apply "stash@{n}"

1

$ git stash apply "stash@{2.hours.ago}"

1
2

$ git stash create
$ git stash store -m "commit-message" CREATED_SHA1

1

$ git clone --recursive git://github.com/foo/bar.git

1

$ git submodule update --init --recursive

1
2

$ git tag -d <tag_name>
$ git push <remote> :refs/tags/<tag_name>

1

$ git fsck --unreachable | grep tag

1

$ git update-ref refs/tags/<tag_name> <hash>

1

(main)$ git mv --force myfile MyFile

1

(main)$ git rm --cached log.txt

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20

[alias]
    a = add
    amend = commit --amend
    c = commit
    ca = commit --amend
    ci = commit -a
    co = checkout
    d = diff
    dc = diff --changed
    ds = diff --staged
    f = fetch
    loll = log --graph --decorate --pretty=oneline --abbrev-commit
    m = merge
    one = log --pretty=oneline
    outstanding = rebase -i @{u}
    s = status
    unpushed = log @{u}
    wc = whatchanged
    wip = rebase -i @{u}
    zap = fetch -p

1
2

$ git config --global credential.helper cache
# Set git to use the credential memory cache

1
2

$ git config --global credential.helper 'cache --timeout=3600'
# Set the cache to timeout after 1 hour (setting is in seconds)

1
2
3
4

(main)$ git reflog
0a2e358 HEAD@{0}: reset: moving to HEAD~2
0254ea7 HEAD@{1}: checkout: moving from 2.2 to main
c10f740 HEAD@{2}: checkout: moving from main to 2.2

1

$ git reset --hard 0254ea7