diff options
| author | Juergen Kahrs <Juergen.Kahrs@vr-web.de> | 2011-10-28 21:29:35 +0200 |
|---|---|---|
| committer | Juergen Kahrs <Juergen.Kahrs@vr-web.de> | 2011-10-28 21:29:35 +0200 |
| commit | 8dffe780526d2bd419d17917eacd91bbacbab9ec (patch) | |
| tree | ec35b330a2cdadee83fc31504755e01e9879c5d9 | |
| parent | 69239a8fd65ad7f55cc2d567c933a800d5d10fac (diff) | |
| download | egawk-8dffe780526d2bd419d17917eacd91bbacbab9ec.tar.gz egawk-8dffe780526d2bd419d17917eacd91bbacbab9ec.tar.bz2 egawk-8dffe780526d2bd419d17917eacd91bbacbab9ec.zip | |
How to merge master patches into feature branch. Ignored some more generated files.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | README.git | 11 | ||||
| -rw-r--r-- | doc/.gitignore | 2 |
3 files changed, 15 insertions, 0 deletions
@@ -15,4 +15,6 @@ dgawk gawk pgawk stamp-h1 +awkgram.c +command.c @@ -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 + |