diff options
| -rw-r--r-- | README.git | 24 |
1 files changed, 22 insertions, 2 deletions
@@ -179,6 +179,12 @@ something to the repository. git checkout my_stuff # change to branch my_stuff git checkout -b my_stuff # create new branch my_stuff and change to it +- How can I pull patches from a branch ? + + git pull origin feature_branch + +The name of the branch can be omitted if your current branch is +created to track the feature_branch ("git branch -t", see below). - How can I create a branch ? @@ -188,7 +194,8 @@ branch shall be based on the master branch. # make master branch the base git checkout master - git branch my_new_feature_branch + # create new feature branch and connect local to upstream branch + git branch -t my_new_feature_branch touch my_new_file.c git add my_new_file.c git status @@ -203,7 +210,9 @@ My feature branch has been created as describe above (based on master). While I committed and pushed up my changes, the master branch has also changed. Now I want to catch up with recent changes in the master branch. - git merge origin/master + git diff origin/master # What is in master that I don't have ? + git merge origin/master # Merge all master patches into local rep + git push -u origin my_new_feature_branch # Push these local changes up - How can I throw away an obsolete branch ? @@ -221,6 +230,10 @@ Now I want to catch up with recent changes in the master branch. If you have already committed the change and want back the last pushed version, use "git reset" instead. +- I have committed stupid changes, how can I undo the "git commit" ? + + http://stackoverflow.com/questions/927358/git-undo-last-commit + - Who changed a specific line in my file ? @@ -246,6 +259,13 @@ You can inspect the log history file-wise but also directory-wise. git gc +- How can I change settings with an editor (without "git xxx" command) ? + +This is useful for inspecting the settings of local and remote branches that track each other. + + vi .git/config + + Thanks, |