Re: A couple of rebase --autosquash proposals

2013-12-09 Thread Chris Packham
On 09/12/13 19:51, Johannes Sixt wrote: Am 12/9/2013 3:23, schrieb Brett Randall: * fixup! or squash! on it's own would default to fixing-up the previous commit (or result of previous step of rebase if that was a squash/fixup). Why would you want that? To fixup the previous commit, just use

Re: A couple of rebase --autosquash proposals

2013-12-09 Thread Brett Randall
This aims to support code-review workflows of teams that prefer rebase over merge, when committing a new peer-reviewed feature. * Developer starts with commit OM, commits A. * During testing, the developer may make further changes, either through --amend or new commits, but either way, all work

Re: A couple of rebase --autosquash proposals

2013-12-09 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Am 12/9/2013 3:23, schrieb Brett Randall: * fixup! or squash! on it's own would default to fixing-up the previous commit (or result of previous step of rebase if that was a squash/fixup). Why would you want that? To fixup the previous commit, just

Re: A couple of rebase --autosquash proposals

2013-12-09 Thread Brett Randall
I had not previously noticed commit --fixup, so that is something useful I have learned from this thread, thanks. The workflow here can be summarized as I have an initial commit and subsequent, review-generated commits, that I'd like to share on a review-branch with proper commit-log comments,

A couple of rebase --autosquash proposals

2013-12-08 Thread Brett Randall
Hi, I am using Git 1.8.4.3 compiled by me on OEL6. I'd like to be able to use rebase --autosquash like this: == # git log commit b94f970cd869dfbf5254b19867fa7200df732d4f Author: Me m...@me.com Date: Mon Dec 9 17:02:32 2013 -0800 fixup! This is a second fixup.

Re: A couple of rebase --autosquash proposals

2013-12-08 Thread Johannes Sixt
Am 12/9/2013 3:23, schrieb Brett Randall: * fixup! or squash! on it's own would default to fixing-up the previous commit (or result of previous step of rebase if that was a squash/fixup). Why would you want that? To fixup the previous commit, just use 'git commit --amend'. What am I missing?