mirror of
https://github.com/git/git.git
synced 2026-01-11 13:23:12 +09:00
884f4055f3
When rewriting history via git-rebase(1) there are a few very common use
cases:
- The ordering of two commits should be reversed.
- A commit should be split up into two commits.
- A commit should be dropped from the history completely.
- Multiple commits should be squashed into one.
- Editing an existing commit that is not the tip of the current
branch.
While these operations are all doable, it often feels needlessly kludgey
to do so by doing an interactive rebase, using the editor to say what
one wants, and then perform the actions. Also, some operations like
splitting up a commit into two are way more involved than that and
require a whole series of commands.
Another problem that rebases have is that dependent branches are not
being updated. The use of stacked branches has grown quite common with
competiting version control systems like Jujutsu though, so it clearly
is a need that users have. While rebases _can_ serve this use case if
one always works on the latest stacked branch, it is somewhat awkward
and very easy to get wrong.
Add a new "history" command to plug these gaps. This command will have
several different subcommands to imperatively rewrite history for common
use cases like the above.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
262 lines
3.6 KiB
Plaintext
262 lines
3.6 KiB
Plaintext
/fuzz_corpora
|
|
/target/
|
|
/Cargo.lock
|
|
/GIT-BUILD-DIR
|
|
/GIT-BUILD-OPTIONS
|
|
/GIT-CFLAGS
|
|
/GIT-LDFLAGS
|
|
/GIT-PREFIX
|
|
/GIT-PERL-DEFINES
|
|
/GIT-PERL-HEADER
|
|
/GIT-PYTHON-VARS
|
|
/GIT-SCRIPT-DEFINES
|
|
/GIT-SPATCH-DEFINES
|
|
/GIT-TEST-SUITES
|
|
/GIT-USER-AGENT
|
|
/GIT-VERSION-FILE
|
|
/git
|
|
/git-add
|
|
/git-am
|
|
/git-annotate
|
|
/git-apply
|
|
/git-archimport
|
|
/git-archive
|
|
/git-backfill
|
|
/git-bisect
|
|
/git-blame
|
|
/git-branch
|
|
/git-bugreport
|
|
/git-bundle
|
|
/git-cat-file
|
|
/git-check-attr
|
|
/git-check-ignore
|
|
/git-check-mailmap
|
|
/git-check-ref-format
|
|
/git-checkout
|
|
/git-checkout--worker
|
|
/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-diagnose
|
|
/git-diff
|
|
/git-diff-files
|
|
/git-diff-index
|
|
/git-diff-pairs
|
|
/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-for-each-repo
|
|
/git-format-patch
|
|
/git-fsck
|
|
/git-fsck-objects
|
|
/git-fsmonitor--daemon
|
|
/git-gc
|
|
/git-get-tar-commit-id
|
|
/git-grep
|
|
/git-hash-object
|
|
/git-help
|
|
/git-history
|
|
/git-hook
|
|
/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-last-modified
|
|
/git-log
|
|
/git-ls-files
|
|
/git-ls-remote
|
|
/git-ls-tree
|
|
/git-mailinfo
|
|
/git-mailsplit
|
|
/git-maintenance
|
|
/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-patch-id
|
|
/git-prune
|
|
/git-prune-packed
|
|
/git-pull
|
|
/git-push
|
|
/git-quiltimport
|
|
/git-range-diff
|
|
/git-read-tree
|
|
/git-rebase
|
|
/git-receive-pack
|
|
/git-reflog
|
|
/git-refs
|
|
/git-remote
|
|
/git-remote-http
|
|
/git-remote-https
|
|
/git-remote-ftp
|
|
/git-remote-ftps
|
|
/git-remote-fd
|
|
/git-remote-ext
|
|
/git-repack
|
|
/git-replace
|
|
/git-replay
|
|
/git-repo
|
|
/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-sh-i18n
|
|
/git-sh-i18n--envsubst
|
|
/git-sh-setup
|
|
/git-shell
|
|
/git-shortlog
|
|
/git-show
|
|
/git-show-branch
|
|
/git-show-index
|
|
/git-show-ref
|
|
/git-sparse-checkout
|
|
/git-stage
|
|
/git-stash
|
|
/git-status
|
|
/git-stripspace
|
|
/git-submodule
|
|
/git-submodule--helper
|
|
/git-subtree
|
|
/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-version
|
|
/git-web--browse
|
|
/git-whatchanged
|
|
/git-worktree
|
|
/git-write-tree
|
|
/scalar
|
|
/git-core-*/?*
|
|
/git.res
|
|
/gitweb/GITWEB-BUILD-OPTIONS
|
|
/gitweb/gitweb.cgi
|
|
/gitweb/static/gitweb.js
|
|
/gitweb/static/gitweb.min.*
|
|
/config-list.h
|
|
/command-list.h
|
|
/hook-list.h
|
|
/version-def.h
|
|
*.tar.gz
|
|
*.dsc
|
|
*.deb
|
|
/git.rc
|
|
/git.spec
|
|
*.exe
|
|
*.[aos]
|
|
*.o.json
|
|
*.py[co]
|
|
.build/
|
|
.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*
|
|
/compile_commands.json
|
|
/.cache/
|
|
*.hcc
|
|
*.obj
|
|
*.lib
|
|
*.sln
|
|
*.sp
|
|
*.suo
|
|
*.ncb
|
|
*.vcproj
|
|
*.user
|
|
*.idb
|
|
*.pdb
|
|
*.ilk
|
|
*.iobj
|
|
*.ipdb
|
|
*.dll
|
|
.vs/
|
|
Debug/
|
|
Release/
|
|
/UpgradeLog*.htm
|
|
/git.VC.VC.opendb
|
|
/git.VC.db
|
|
*.dSYM
|
|
/contrib/buildsystems/out
|
|
/contrib/libgit-rs/target
|
|
/contrib/libgit-sys/target
|