git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9e62316)
merge: simplify code flow
authorJunio C Hamano <redacted>
Thu, 23 Apr 2015 20:01:44 +0000 (13:01 -0700)
committerJunio C Hamano <redacted>
Wed, 29 Apr 2015 20:17:52 +0000 (13:17 -0700)
commit00c7e7e7e8a2aa07b2cd3a09c8f9e11872727d86
tree27e02b5a2c9139ab6bbe552629313229213c075atree | snapshot
parent9e62316df7f918eabc879f97da76543cc5f0b3fccommit | diff
merge: simplify code flow

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 <redacted>
builtin/merge.c diff | blob | history
git clone https://git.99rst.org/PROJECT