Jeff King writes:
> Yeah, this looks obviously correct.
It is funny that this dates back to the very beginning of defaulting
to the upstream, the code that "if ()" block implements, introduced
at 93e535a5 (merge: merge with the default upstream branch without
argument, 2011-03-23).
> As an asid
On Thu, Apr 23, 2015 at 01:01:44PM -0700, Junio C Hamano wrote:
> One of the first things cmd_merge() does is to see if the "--abort"
> option is given and run "reset --merge" and exit. When the control
> reaches this point, we know "--abort" was not given.
>
> Signed-off-by: Junio C Hamano
Ye
One of the first things cmd_merge() does is to see if the "--abort"
option is given and run "reset --merge" and exit. When the control
reaches this point, we know "--abort" was not given.
Signed-off-by: Junio C Hamano
---
builtin/merge.c | 16
1 file changed, 8 insertions(+), 8
3 matches
Mail list logo
