X-Git-Url: http://www.privoxy.org/gitweb/contact.html?a=blobdiff_plain;f=doc%2Fwebserver%2Fdeveloper-manual%2Fgit.html;h=e9c8d75578101b6137d0cbfa9cb090afa50eeeda;hb=ab1954feed634fdbcf43ac5087615f9874fe06f2;hp=cd3c4a9fa2dd9045a2c1411641cafb9c4b6d3b64;hpb=7ad856abcd5a31a636c188c9f19fd00f0f049049;p=privoxy.git diff --git a/doc/webserver/developer-manual/git.html b/doc/webserver/developer-manual/git.html index cd3c4a9f..e9c8d755 100644 --- a/doc/webserver/developer-manual/git.html +++ b/doc/webserver/developer-manual/git.html @@ -54,51 +54,51 @@
- fk@t520 ~/git/privoxy $git checkout master -Switched to branch 'master' -Your branch is up to date with 'origin/master'. -# Make sure you have the latest changes -fk@t520 ~/git/privoxy $git pull -Already up to date. -# Create a local banch for changes -fk@t520 ~/git/privoxy $git checkout -b local-branch -Switched to a new branch 'local-branch' -# Create some change -fk@t520 ~/git/privoxy $gmake dok dok-tidy -[...] -# Review your change -fk@t520 ~/git/privoxy $git diff -[...] -# Commit your changes if they look goood -fk@t520 ~/git/privoxy $git commit -m "developer-manual: Regenerate" doc/webserver/ -[local-branch 1abb7316] developer-manual: Regenerate - 1 file changed, 2 insertions(+), 2 deletions(-) -# Review your commit -fk@t520 ~/git/privoxy $git show -[...] -# Go to the master branch -fk@t520 ~/git/privoxy $git checkout master -Switched to branch 'master' -Your branch is up to date with 'origin/master'. -# Make sure you are still in sync -fk@t520 ~/git/privoxy $git pull -[...] -Already up to date. -# Apply the commit you made to the local-branch -fk@t520 ~/git/privoxy $git cherry-pick local-branch -[master 046e85e2] developer-manual: Regenerate - Date: Tue Dec 15 05:10:07 2020 +0100 - 1 file changed, 2 insertions(+), 2 deletions(-) -# Make sure the history looks as expected -fk@t520 ~/git/privoxy $git log -p -# Finally push your change to the Privoxy repository -fk@t520 ~/git/privoxy $git push -[...] -# Go back to the local branch -fk@t520 ~/git/privoxy $git checkout local-branch -# Rebase on top of master and continue hacking -fk@t520 ~/git/privoxy $git rebase master -Successfully rebased and updated refs/heads/local-branch.+ fk@t520 ~/git/privoxy $git checkout master + Switched to branch 'master' + Your branch is up to date with 'origin/master'. + # Make sure you have the latest changes + fk@t520 ~/git/privoxy $git pull + Already up to date. + # Create a local banch for changes + fk@t520 ~/git/privoxy $git checkout -b local-branch + Switched to a new branch 'local-branch' + # Create some change + fk@t520 ~/git/privoxy $gmake dok dok-tidy + [...] + # Review your change + fk@t520 ~/git/privoxy $git diff + [...] + # Commit your changes if they look goood + fk@t520 ~/git/privoxy $git commit -m "developer-manual: Regenerate" doc/webserver/ + [local-branch 1abb7316] developer-manual: Regenerate + 1 file changed, 2 insertions(+), 2 deletions(-) + # Review your commit + fk@t520 ~/git/privoxy $git show + [...] + # Go to the master branch + fk@t520 ~/git/privoxy $git checkout master + Switched to branch 'master' + Your branch is up to date with 'origin/master'. + # Make sure you are still in sync + fk@t520 ~/git/privoxy $git pull + [...] + Already up to date. + # Apply the commit you made to the local-branch + fk@t520 ~/git/privoxy $git cherry-pick local-branch + [master 046e85e2] developer-manual: Regenerate + Date: Tue Dec 15 05:10:07 2020 +0100 + 1 file changed, 2 insertions(+), 2 deletions(-) + # Make sure the history looks as expected + fk@t520 ~/git/privoxy $git log -p + # Finally push your change to the Privoxy repository + fk@t520 ~/git/privoxy $git push + [...] + # Go back to the local branch + fk@t520 ~/git/privoxy $git checkout local-branch + # Rebase on top of master and continue hacking + fk@t520 ~/git/privoxy $git rebase master + Successfully rebased and updated refs/heads/local-branch. |