mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Nguyễn Thái Ngọc Duy](/assets/img/avatar_default.png)
Previously the switching branch business of 'git checkout' becomes a new command 'switch'. This adds the restore command for the checking out paths path. Similar to git-switch, a new man page is added to describe what the command will become. The implementation will be updated shortly to match the man page. A couple main differences from 'git checkout <paths>': - 'restore' by default will only update worktree. This matters more when --source is specified ('checkout <tree> <paths>' updates both worktree and index). - 'restore --staged' can be used to restore the index. This command overlaps with 'git reset <paths>'. - both worktree and index could also be restored at the same time (from a tree) when both --staged and --worktree are specified. This overlaps with 'git checkout <tree> <paths>' - default source for restoring worktree and index is the index and HEAD respectively. A different (tree) source could be specified as with --source (*). - when both index and worktree are restored, --source must be specified since the default source for these two individual targets are different (**) - --no-overlay is enabled by default, if an entry is missing in the source, restoring means deleting the entry (*) I originally went with --from instead of --source. I still think --from is a better name. The short option -f however is already taken by force. And I do think short option is good to have, e.g. to write -s@ or -s@^ instead of --source=HEAD. (**) If you sit down and think about it, moving worktree's source from the index to HEAD makes sense, but nobody is really thinking it through when they type the commands. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
235 lines
3.3 KiB
Plaintext
235 lines
3.3 KiB
Plaintext
/fuzz-commit-graph
|
|
/fuzz_corpora
|
|
/fuzz-pack-headers
|
|
/fuzz-pack-idx
|
|
/GIT-BUILD-OPTIONS
|
|
/GIT-CFLAGS
|
|
/GIT-LDFLAGS
|
|
/GIT-PREFIX
|
|
/GIT-PERL-DEFINES
|
|
/GIT-PERL-HEADER
|
|
/GIT-PYTHON-VARS
|
|
/GIT-SCRIPT-DEFINES
|
|
/GIT-USER-AGENT
|
|
/GIT-VERSION-FILE
|
|
/bin-wrappers/
|
|
/git
|
|
/git-add
|
|
/git-add--interactive
|
|
/git-am
|
|
/git-annotate
|
|
/git-apply
|
|
/git-archimport
|
|
/git-archive
|
|
/git-bisect
|
|
/git-bisect--helper
|
|
/git-blame
|
|
/git-branch
|
|
/git-bundle
|
|
/git-cat-file
|
|
/git-check-attr
|
|
/git-check-ignore
|
|
/git-check-mailmap
|
|
/git-check-ref-format
|
|
/git-checkout
|
|
/git-checkout-index
|
|
/git-cherry
|
|
/git-cherry-pick
|
|
/git-clean
|
|
/git-clone
|
|
/git-column
|
|
/git-commit
|
|
/git-commit-graph
|
|
/git-commit-tree
|
|
/git-config
|
|
/git-count-objects
|
|
/git-credential
|
|
/git-credential-cache
|
|
/git-credential-cache--daemon
|
|
/git-credential-store
|
|
/git-cvsexportcommit
|
|
/git-cvsimport
|
|
/git-cvsserver
|
|
/git-daemon
|
|
/git-diff
|
|
/git-diff-files
|
|
/git-diff-index
|
|
/git-diff-tree
|
|
/git-difftool
|
|
/git-difftool--helper
|
|
/git-describe
|
|
/git-fast-export
|
|
/git-fast-import
|
|
/git-fetch
|
|
/git-fetch-pack
|
|
/git-filter-branch
|
|
/git-fmt-merge-msg
|
|
/git-for-each-ref
|
|
/git-format-patch
|
|
/git-fsck
|
|
/git-fsck-objects
|
|
/git-gc
|
|
/git-get-tar-commit-id
|
|
/git-grep
|
|
/git-hash-object
|
|
/git-help
|
|
/git-http-backend
|
|
/git-http-fetch
|
|
/git-http-push
|
|
/git-imap-send
|
|
/git-index-pack
|
|
/git-init
|
|
/git-init-db
|
|
/git-interpret-trailers
|
|
/git-instaweb
|
|
/git-legacy-rebase
|
|
/git-log
|
|
/git-ls-files
|
|
/git-ls-remote
|
|
/git-ls-tree
|
|
/git-mailinfo
|
|
/git-mailsplit
|
|
/git-merge
|
|
/git-merge-base
|
|
/git-merge-index
|
|
/git-merge-file
|
|
/git-merge-tree
|
|
/git-merge-octopus
|
|
/git-merge-one-file
|
|
/git-merge-ours
|
|
/git-merge-recursive
|
|
/git-merge-resolve
|
|
/git-merge-subtree
|
|
/git-mergetool
|
|
/git-mergetool--lib
|
|
/git-mktag
|
|
/git-mktree
|
|
/git-multi-pack-index
|
|
/git-mv
|
|
/git-name-rev
|
|
/git-notes
|
|
/git-p4
|
|
/git-pack-redundant
|
|
/git-pack-objects
|
|
/git-pack-refs
|
|
/git-parse-remote
|
|
/git-patch-id
|
|
/git-prune
|
|
/git-prune-packed
|
|
/git-pull
|
|
/git-push
|
|
/git-quiltimport
|
|
/git-range-diff
|
|
/git-read-tree
|
|
/git-rebase
|
|
/git-rebase--am
|
|
/git-rebase--common
|
|
/git-rebase--interactive
|
|
/git-rebase--preserve-merges
|
|
/git-receive-pack
|
|
/git-reflog
|
|
/git-remote
|
|
/git-remote-http
|
|
/git-remote-https
|
|
/git-remote-ftp
|
|
/git-remote-ftps
|
|
/git-remote-fd
|
|
/git-remote-ext
|
|
/git-remote-testgit
|
|
/git-remote-testpy
|
|
/git-remote-testsvn
|
|
/git-repack
|
|
/git-replace
|
|
/git-request-pull
|
|
/git-rerere
|
|
/git-reset
|
|
/git-restore
|
|
/git-rev-list
|
|
/git-rev-parse
|
|
/git-revert
|
|
/git-rm
|
|
/git-send-email
|
|
/git-send-pack
|
|
/git-serve
|
|
/git-sh-i18n
|
|
/git-sh-i18n--envsubst
|
|
/git-sh-setup
|
|
/git-sh-i18n
|
|
/git-shell
|
|
/git-shortlog
|
|
/git-show
|
|
/git-show-branch
|
|
/git-show-index
|
|
/git-show-ref
|
|
/git-stage
|
|
/git-stash
|
|
/git-status
|
|
/git-stripspace
|
|
/git-submodule
|
|
/git-submodule--helper
|
|
/git-svn
|
|
/git-switch
|
|
/git-symbolic-ref
|
|
/git-tag
|
|
/git-unpack-file
|
|
/git-unpack-objects
|
|
/git-update-index
|
|
/git-update-ref
|
|
/git-update-server-info
|
|
/git-upload-archive
|
|
/git-upload-pack
|
|
/git-var
|
|
/git-verify-commit
|
|
/git-verify-pack
|
|
/git-verify-tag
|
|
/git-web--browse
|
|
/git-whatchanged
|
|
/git-worktree
|
|
/git-write-tree
|
|
/git-core-*/?*
|
|
/gitweb/GITWEB-BUILD-OPTIONS
|
|
/gitweb/gitweb.cgi
|
|
/gitweb/static/gitweb.js
|
|
/gitweb/static/gitweb.min.*
|
|
/command-list.h
|
|
*.tar.gz
|
|
*.dsc
|
|
*.deb
|
|
/git.spec
|
|
*.exe
|
|
*.[aos]
|
|
*.py[co]
|
|
.depend/
|
|
*.gcda
|
|
*.gcno
|
|
*.gcov
|
|
/coverage-untested-functions
|
|
/cover_db/
|
|
/cover_db_html/
|
|
*+
|
|
/config.mak
|
|
/autom4te.cache
|
|
/config.cache
|
|
/config.log
|
|
/config.status
|
|
/config.mak.autogen
|
|
/config.mak.append
|
|
/configure
|
|
/.vscode/
|
|
/tags
|
|
/TAGS
|
|
/cscope*
|
|
*.obj
|
|
*.lib
|
|
*.res
|
|
*.sln
|
|
*.suo
|
|
*.ncb
|
|
*.vcproj
|
|
*.user
|
|
*.idb
|
|
*.pdb
|
|
/Debug/
|
|
/Release/
|
|
*.dSYM
|