[gawk-diffs] [SCM] gawk branch, xgawk, updated. 02108925ef6d1c8bae2aea95864a0e22ce0fc55e

[Juergen Kahrs]

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 has been updated
       via  02108925ef6d1c8bae2aea95864a0e22ce0fc55e (commit)
       via  9b594365fa257ae16a479038805840e447b24336 (commit)
       via  c40211033292efb689bfca1819d9d34fd1e3b8cd (commit)
       via  2dcf0c1084fafc7bb4d8ff5435a228ce90c408f8 (commit)
       via  8dffe780526d2bd419d17917eacd91bbacbab9ec (commit)
      from  0d3d874286915d998648922158dabf2ffc38d7f9 (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=02108925ef6d1c8bae2aea95864a0e22ce0fc55e

commit 02108925ef6d1c8bae2aea95864a0e22ce0fc55e
Merge: 9b59436 0d3d874
Author: Juergen Kahrs <address@hidden>
Date:   Sun Mar 25 16:20:14 2012 +0200

    Merge branch 'xgawk' of ssh://git.sv.gnu.org/srv/git/gawk into xgawk


http://git.sv.gnu.org/cgit/gawk.git/commit/?id=9b594365fa257ae16a479038805840e447b24336

commit 9b594365fa257ae16a479038805840e447b24336
Author: Juergen Kahrs <address@hidden>
Date:   Sun Mar 25 16:18:43 2012 +0200

    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 
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,
 

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=c40211033292efb689bfca1819d9d34fd1e3b8cd

commit c40211033292efb689bfca1819d9d34fd1e3b8cd
Merge: 2dcf0c1 b51edf3
Author: Juergen Kahrs <address@hidden>
Date:   Tue Mar 20 17:44:53 2012 +0100

    Merge branch 'xgawk' of ssh://git.sv.gnu.org/srv/git/gawk into xgawk


http://git.sv.gnu.org/cgit/gawk.git/commit/?id=2dcf0c1084fafc7bb4d8ff5435a228ce90c408f8

commit 2dcf0c1084fafc7bb4d8ff5435a228ce90c408f8
Merge: 8dffe78 cd44d95
Author: Juergen Kahrs <address@hidden>
Date:   Tue Mar 20 17:21:22 2012 +0100

    Merge remote-tracking branch 'origin/master' into xgawk


http://git.sv.gnu.org/cgit/gawk.git/commit/?id=8dffe780526d2bd419d17917eacd91bbacbab9ec

commit 8dffe780526d2bd419d17917eacd91bbacbab9ec
Author: Juergen Kahrs <address@hidden>
Date:   Fri Oct 28 21:29:35 2011 +0200

    How to merge master patches into feature branch. Ignored some more 
generated files.

diff --git a/.gitignore b/.gitignore
index e2ae74d..7e6ea1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,6 @@ dgawk
 gawk
 pgawk
 stamp-h1
+awkgram.c
+command.c
 
diff --git a/README.git b/README.git
index 5907959..ba08ad7 100644
--- a/README.git
+++ b/README.git
@@ -179,6 +179,7 @@ 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 create a branch ?
 
 For each new feature to be considered for inclusion into future
@@ -195,6 +196,16 @@ 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 merge origin/master
+
+
 - How can I throw away an obsolete branch ?
 
   git push origin :newfeature      # remove remote branch
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..cf3a28c
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,2 @@
+gawk.info
+

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

Summary of changes:
 .gitignore     |    2 ++
 README.git     |   33 ++++++++++++++++++++++++++++++++-
 doc/.gitignore |    2 ++
 3 files changed, 36 insertions(+), 1 deletions(-)
 create mode 100644 doc/.gitignore


hooks/post-receive
-- 
gawk