[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gawk-diffs] [SCM] gawk branch, xgawk_load, updated. e6af8a65d6bd7d7c7e1

From: Juergen Kahrs
Subject: [gawk-diffs] [SCM] gawk branch, xgawk_load, updated. e6af8a65d6bd7d7c7e1a42acb673ff1cbf0714f1
Date: Fri, 23 Mar 2012 14:03:14 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, xgawk_load has been updated
       via  e6af8a65d6bd7d7c7e1a42acb673ff1cbf0714f1 (commit)
      from  8dffe780526d2bd419d17917eacd91bbacbab9ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

commit e6af8a65d6bd7d7c7e1a42acb673ff1cbf0714f1
Author: Juergen Kahrs <address@hidden>
Date:   Fri Mar 23 15:02:27 2012 +0100

    Added some details on branch tracking and undoing as suggested by Aharon.

diff --git a/README.git b/README.git
index ba08ad7..490558a 100644
--- a/README.git
+++ b/README.git
@@ -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 
   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" ?
 - Who changed a specific line in my file ?
@@ -246,6 +259,13 @@ You can inspect the log history file-wise but also 
   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


Summary of changes:
 README.git |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]