| commit | b4fd94064de5cec7a45883684225b600d36208d9 | |
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
| Fri, 19 Aug 2011 14:50:05 +0000 (19 21:50 +0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Aug 2011 20:35:31 +0000 (26 13:35 -0700) | ||
| tree | ab819d087dff67eb99cde8d9cd63a55266cabeb6 | treesnapshot (tar.gz zip) |
| parent | 06bb643b72cc6c67d7c0ac9b8d923463bae68822 | commitdiff |
merge: keep stash[] a local variable
A stash is created by save_state() and used by restore_state(). Pass
SHA-1 explicitly for clarity and keep stash[] to cmd_merge().
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A stash is created by save_state() and used by restore_state(). Pass
SHA-1 explicitly for clarity and keep stash[] to cmd_merge().
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |