]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 683c54c) | patch
stash: remove merge-recursive.h include
authorElijah Newren <newren@gmail.com>
Sun, 16 Mar 2025 06:58:55 +0000 (06:58 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Mar 2025 22:39:03 +0000 (15:39 -0700)
commite40eefba02d684253bc5102eaa921db7ddd21128
tree11176226c171bf4aa695b3cdb9e0a2171f1083abtree | snapshot
parent683c54c999c301c2cd6f715c411407c413b1d84ecommit | diff
stash: remove merge-recursive.h include

stash was modified to use merge_ort_nonrecursive() instead of
merge_recursive_generic() back in commit 874cf2a60444 (stash: apply
stash using 'merge_ort_nonrecursive()', 2022-05-10).  That makes the
inclusion of merge-recursive.h unnecessary.  In preparation for the
removal of merge-recursive.h, remove the unnecessary include.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/stash.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.