Peter Stuge wrote: > > git fetch http://briens...@openocd.zylin.com/openocd refs/changes/27/1427/4 > > && git checkout FETCH_HEAD > > > > <change code> > > > > git commit -s -a > > Here you should also include --amend on the commit command line.
git commit --amend means that the previous commit is replaced with a new commit with the new state of your worktree. > > <enter commit message> The commit message you enter is thus the only commit message visible for the new state of your worktree and usually you want to keep some part of the original commit message and perhaps add something to it depending on what the new changes are. > > git pull --rebase origin master // as described in the patch guidlines > > Here you yourself can easily review what you are about to push: > > git log -p --reverse origin/master..HEAD Please really do make use of this. It shows exactly what you are about to propose for inclusion, in chronological order, with commit message and commit contents. Tip: Double-check that there is a Change-Id: line in the output, otherwise the commit-hook isn't configured correctly in your local repository and then you will not be able to create new iterations of changes in gerrit. The Change-Id line is what connects them. //Peter ------------------------------------------------------------------------------ WatchGuard Dimension instantly turns raw network data into actionable security intelligence. It gives you real-time visual feedback on key security issues and trends. Skip the complicated setup - simply import a virtual appliance and go from zero to informed in seconds. http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk _______________________________________________ OpenOCD-devel mailing list OpenOCD-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openocd-devel
