From 8dffe780526d2bd419d17917eacd91bbacbab9ec Mon Sep 17 00:00:00 2001 From: Juergen Kahrs Date: Fri, 28 Oct 2011 21:29:35 +0200 Subject: How to merge master patches into feature branch. Ignored some more generated files. --- .gitignore | 2 ++ README.git | 11 +++++++++++ doc/.gitignore | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 doc/.gitignore diff --git a/.gitignore b/.gitignore index e2ae74d3..7e6ea1b8 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 59079598..ba08ad74 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 00000000..cf3a28cd --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,2 @@ +gawk.info + -- cgit v1.2.3