$ git add -i
staged unstaged path
1: unchanged +0/-1 TODO
2: unchanged +1/-1 index.html
3: unchanged +5/-1 lib/simplegit.rb
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now>$ git rm --cached file1
rm 'file1'
$ ls
file1 file2 file3
$ git checkout -- file1 add commit message in editor
$ git config --global core.editor nano
$ #or ($VISUAL or $EDITOR)
$ git config core.editor
nano
$ git commit
stash local changes
$ git stash
Saved working directory and index state \
"WIP on master: 049d078 added the index file"
HEAD is now at 049d078 added the index file
(To restore them type "git stash apply")
$ git status
# On branch master
nothing to commit, working directory clean
(re)apply stashes
$ git stash list
stash@{0}: WIP on master: 049d078 added the index file
stash@{1}: WIP on master: c264051... Revert "added file_size"
stash@{2}: WIP on master: 21d80a5... added number to log
$ git stash apply
# On branch master
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
#
# modified: index.html
# modified: lib/simplegit.rb
#
$ git tag
$ git tag tag1
$ git tag tag2
$ git tag
tag1
tag2
$ git tag -l '*2'
tag2
$ git branch -d branch1
$ git branch
* branch2
master
$ git branch -m branch2 branch1
$ git branch
* branch1
mastergit config --global --add merge.tool kdiff3$ git rebase master $ git show 933c51027acf9956c6e02950e92af72e277200b1
commit 933c51027acf9956c6e02950e92af72e277200b1
Author: Florian Schimmer <florian.schimmer@conplement.de>
Date: Thu Sep 14 16:20:30 2017 +0200
initial commit
diff --git a/myfile.txt b/myfile.txt
new file mode 100644
index 0000000..e69de29$ # local against HEAD
$ git diff
diff --git a/PITCHME.md b/PITCHME.md
index 95d4db1..c926ec7 100644
--- a/PITCHME.md
+++ b/PITCHME.md
...
$ # local againt HEAD -1
$ git diff HEAD^
...
$ # HEAD againt tag
$ git diff HEAD tags/tag1
...git config --global --add diff.tool kdiff3$ git log v2.5..v2.6 # commits between v2.5 and v2.6
$ git log v2.5.. # commits since v2.5
$ git log --since="2 weeks ago" # commits from the last 2 weeks
$ git log v2.5.. Makefile # commits since v2.5 which modify
# Makefile$ git commit --amend$ git rebase -i HEAD~3 # Displays a list of the last 3 commits on the current branch$ # Looks for time_t in all tracked .c and .h files in the working directory and its subdirectories.
$ git grep time_t - *.[ch]
$ # Looks for a line that has #define and either MAX_PATH or PATH_MAX.
$ git grep -e '#define\' --and \( -e MAX_PATH -e PATH_MAX \)
$ #Looks for a line that has NODE or Unexpected in files that have lines that match both.
$ git grep --all-match -e NODE -e Unexpected
$ git cherry-pick 3158f27
Finished one cherry-pick.
[master c5693f6] bugfix
** either **
add ssh-key to repository (webinterace)
** or **
git config [--global] credential.helper "<helper> [<options>]"
The main concepts behind the Github flow are:
- Anything in the master branch is deployable
- To work on something new, create a descriptively named branch off of master (ie:new-oauth2-scopes)
- Commit to that branch locally and regularly push your work to the same named branch on the server
- When you need feedback or help, or you think the branch is ready for merging, open a pull request
- After someone else has reviewed and signed off on the feature, you can merge it into master
- Once it is merged and pushed to ‘master’, you can and should deploy immediately