On Mon, Jul 8, 2019 at 2:15 PM Junio C Hamano wrote:
> In the body of the proposed commit log message, please finish each
> sentence with a full-stop.
Ok
>
> These bullets are all subjective, and do not add any value to what
> you already said in the second sentence.
Ok
>
> These are facts th
Edmundo Carmona Antoranz writes:
> Previous code was a little convoluted to follow logic
> New code is shorter and logic is easier to follow
In the body of the proposed commit log message, please finish each
sentence with a full-stop.
> - Easier to see what happens when merge is successful
>
On Sat, Jul 6, 2019 at 6:00 PM Edmundo Carmona Antoranz
wrote:
> @@ -1645,6 +1631,7 @@ int cmd_merge(int argc, const char **argv, const char
> *prefix)
> * auto resolved the merge cleanly.
> */
> if (automerge_was_ok) {
> + write_tree_trivial(&result_tree);
Previous code was a little convoluted to follow logic
New code is shorter and logic is easier to follow
- Easier to see what happens when merge is successful
and how --no-commit affects result
- Simpler to see that for-cycle will stop when merge_was_ok is set
- Easier to spot what logic wi
4 matches
Mail list logo
