Re: [PATCH 2/2] learn to pick/revert into unborn branch
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:35
Martin von Zweigbergk [off-list ref] writes:
quoted hunk
@@ -435,8 +437,9 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) else parent = commit->parents->item; - if (opts->allow_ff && parent && !hashcmp(parent->object.sha1, head)) - return fast_forward_to(commit->object.sha1, head); + if (opts->allow_ff && + (parent && !hashcmp(parent->object.sha1, head) || !parent && unborn))
Style (from GNU); please avoid (A && B || C) and spell the precedence between && and || explicitly, i.e. ((A && B) || C)
+ git rm --cached -r . && + rm -rf * &&
Not "git rm -rf ." and as two separate steps?