summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.txt
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2020-04-07 10:28:06 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-10 09:28:02 -0700
commit804fe3155761e73c3dcc4e162ddb3ff560f16cd7 (patch)
treec71f73a82ac0dbbad6983ca7d853e9d35719c351 /Documentation/config/merge.txt
parentsequencer: implement save_autostash() (diff)
downloadtgif-804fe3155761e73c3dcc4e162ddb3ff560f16cd7.tar.xz
sequencer: implement apply_autostash_oid()
Split apply_save_autostash() into apply_autostash_oid() and apply_save_autostash() where the former operates on an OID string and the latter reads the OID from a file before passing it into apply_save_autostash_oid(). This function is required for a future commmit which will rely on being able to apply an autostash whose OID is stored as a string. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/merge.txt')
0 files changed, 0 insertions, 0 deletions