[Top][All Lists]

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

[gawk-diffs] [SCM] gawk branch, xgawk_load, updated. 8dffe780526d2bd419d

From: Juergen Kahrs
Subject: [gawk-diffs] [SCM] gawk branch, xgawk_load, updated. 8dffe780526d2bd419d17917eacd91bbacbab9ec
Date: Fri, 28 Oct 2011 19:29:54 +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  8dffe780526d2bd419d17917eacd91bbacbab9ec (commit)
      from  69239a8fd65ad7f55cc2d567c933a800d5d10fac (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 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
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 @@


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


reply via email to

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