[gawk-diffs] [SCM] gawk branch, xgawk-build, updated. db7a3cd086535605db484590dbac91b2587f8cf5

[Andrew J. Schorr]

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-build has been updated
       via  db7a3cd086535605db484590dbac91b2587f8cf5 (commit)
      from  857a1007645f45c31ed0f6070e04ca066fc1bce5 (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=db7a3cd086535605db484590dbac91b2587f8cf5

commit db7a3cd086535605db484590dbac91b2587f8cf5
Author: Andrew J. Schorr <address@hidden>
Date:   Sun Mar 25 11:09:21 2012 -0400

    Pick up README.git changes that Juergen pushed into the xgawk branch.

diff --git a/.gitignore b/.gitignore
index e2ae74d..533493a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ gawk
 pgawk
 stamp-h1
 
+test/fmtspcl.ok
diff --git a/README.git b/README.git
index 5907959..490558a 100644
--- a/README.git
+++ b/README.git
@@ -179,6 +179,13 @@ 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 ?
 
 For each new feature to be considered for inclusion into future
@@ -187,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
@@ -195,6 +203,18 @@ branch shall be based on the master branch.
   git push -u origin my_new_feature_branch
   git checkout my_new_feature_branch
 
+
+- How can I merge recent patches from the master branch ?
+
+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 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 ?
 
   git push origin :newfeature      # remove remote branch
@@ -210,6 +230,10 @@ branch shall be based on 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 ?
 
@@ -235,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,
 

-----------------------------------------------------------------------

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


hooks/post-receive
-- 
gawk