Re: [PATCH v8 4/4] git-rebase: add keep_empty flag

2012-07-18 Thread Neil Horman
On Wed, Jul 18, 2012 at 09:10:06AM +0200, Johannes Sixt wrote: > Am 7/18/2012 8:20, schrieb Martin von Zweigbergk: > > On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman wrote: > >> pick_one () { > >> ff=--ff > >> + > >> case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac > >> c

Re: [PATCH v8 4/4] git-rebase: add keep_empty flag

2012-07-18 Thread Martin von Zweigbergk
On Wed, Jul 18, 2012 at 12:10 AM, Johannes Sixt wrote: > Am 7/18/2012 8:20, schrieb Martin von Zweigbergk: >> On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman wrote: >>> pick_one () { >>> ff=--ff >>> + >>> case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac >>> case "$force_r

Re: [PATCH v8 4/4] git-rebase: add keep_empty flag

2012-07-18 Thread Johannes Sixt
Am 7/18/2012 8:20, schrieb Martin von Zweigbergk: > On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman wrote: >> pick_one () { >> ff=--ff >> + >> case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac >> case "$force_rebase" in '') ;; ?*) ff= ;; esac >> output git rev-parse

Re: [PATCH v8 4/4] git-rebase: add keep_empty flag

2012-07-17 Thread Martin von Zweigbergk
On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman wrote: > pick_one () { > ff=--ff > + > case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac > case "$force_rebase" in '') ;; ?*) ff= ;; esac > output git rev-parse --verify $sha1 || die "Invalid commit name: > $sha1" > +