projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0c05942) | patch
merge-recursive: Consolidate different update_stages functions
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:52 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:34 +0000 (14:19 -0700)
commit650467cf89e61815cfa1c942544a3659eda88aeb
tree046bec2cd8a74a0c18e49728f988a8670fe06ed1tree | snapshot
parent0c05942087a14be4560d09299fb57117308a69d5commit | diff
merge-recursive: Consolidate different update_stages functions

We are only calling update_stages_options() one way really, so we can
consolidate the slightly different variants into one and remove some
parameters whose values are always the same.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
Git—the stupid content tracker