]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bc/stash-export-import' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jun 2025 16:50:42 +0000 (09:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jun 2025 16:50:43 +0000 (09:50 -0700)
An interchange format for stash entries is defined, and subcommand
of "git stash" to import/export has been added.

* bc/stash-export-import:
  builtin/stash: provide a way to import stashes from a ref
  builtin/stash: provide a way to export stashes to a ref
  builtin/stash: factor out revision parsing into a function
  object-name: make get_oid quietly return an error

1  2 
builtin/stash.c
object-name.c
t/t3903-stash.sh

diff --cc builtin/stash.c
Simple merge
diff --cc object-name.c
Simple merge
Simple merge