Wireshark mailing list archives
git rebase syntax
From: chuck c <bubbasnmp () gmail com>
Date: Sun, 23 May 2021 14:42:25 -0500
Are the examples below interchangeable and if so, is one preferred over the other? https://www.wireshark.org/docs/wsdg_html_chunked/ChSrcUpdating.html#ChSrcGitUpdate 3.5.1. Update Using Git
From time to time you will likely want to synchronize your master branch
with the upstream repository. You can do so by running: $ git pull --rebase upstream master https://gitlab.com/wireshark/wireshark/-/wikis/Development/SubmittingPatches#fixing-merge-errors Rebase against the Wireshark master: git pull --rebase upstream/master
___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev () wireshark org> Archives: https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-request () wireshark org?subject=unsubscribe
Current thread:
- git rebase syntax chuck c (May 23)