]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9472b13 1c41d28)
Merge branch 'ma/unpack-trees-free-msgs'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 12:51:29 +0000 (21:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 12:51:29 +0000 (21:51 +0900)
commite47dbece39712567a36a096010c5c1223119f7e3
treeaced74e797a0c37931e367574bdd60cbfb63e0f4tree | snapshot
parent9472b13201aea57d7f9212ca2678aba4d6dbdfdbcommit | diff
parent1c41d2805e42d77d943fd3d79ebf5136f74c9ba3commit | diff
Merge branch 'ma/unpack-trees-free-msgs'

Leak plugging.

* ma/unpack-trees-free-msgs:
  unpack_trees_options: free messages when done
  argv-array: return the pushed string from argv_push*()
  merge-recursive: provide pair of `unpack_trees_{start,finish}()`
  merge: setup `opts` later in `checkout_fast_forward()`
argv-array.c diff1 | diff2 | blob | history
argv-array.h diff1 | diff2 | blob | history
builtin/checkout.c diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
merge.c diff1 | diff2 | blob | history
unpack-trees.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.