Hi Brad, Brad Riensche wrote: > I am relatively new to git, and very new to Gerrit, so some of this > stuff is very confusing to me.
I'd be happy to explain the git data model if you want. > I am obviously doing something wrong, but I can't figure it out. > Can someone please show me the correct way to do this? > > I am trying to add a patchset to an existing change in Gerrit, but I end up > creating a new, dependent change within Gerrit. .. > git fetch http://[email protected]/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. > <enter commit message> > > 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 I strongly recommend doing that in order to catch simple things that you don't have to bother anyone else with. If you run once: git config --global color.ui auto ..then you'll also get many whitespace errors highlighted in red. > git push review //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 [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
