]> git.ipfire.org Git - thirdparty/git.git/commit - branch.c
Merge branch 'nd/switch-and-restore'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:44 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:44 +0000 (15:25 -0700)
commitf496b064fc1135e0dded7f93d85d72eb0b302c22
tree2149d0faf99c67ddd76a6d68125037f661db48a5
parentb49d337bfbdd431697161244ff7b2241d9887c9f
parent97ed685701a6df0273f7d29fd5bc0a0658a63cad
Merge branch 'nd/switch-and-restore'

Two new commands "git switch" and "git restore" are introduced to
split "checking out a branch to work on advancing its history" and
"checking out paths out of the index and/or a tree-ish to work on
advancing the current history" out of the single "git checkout"
command.

* nd/switch-and-restore: (46 commits)
  completion: disable dwim on "git switch -d"
  switch: allow to switch in the middle of bisect
  t2027: use test_must_be_empty
  Declare both git-switch and git-restore experimental
  help: move git-diff and git-reset to different groups
  doc: promote "git restore"
  user-manual.txt: prefer 'merge --abort' over 'reset --hard'
  completion: support restore
  t: add tests for restore
  restore: support --patch
  restore: replace --force with --ignore-unmerged
  restore: default to --source=HEAD when only --staged is specified
  restore: reject invalid combinations with --staged
  restore: add --worktree and --staged
  checkout: factor out worktree checkout code
  restore: disable overlay mode by default
  restore: make pathspec mandatory
  restore: take tree-ish from --source option instead
  checkout: split part of it to new command 'restore'
  doc: promote "git switch"
  ...
41 files changed:
.gitignore
Documentation/config/advice.txt
Documentation/config/branch.txt
Documentation/config/diff.txt
Documentation/git-branch.txt
Documentation/git-checkout.txt
Documentation/git-clean.txt
Documentation/git-format-patch.txt
Documentation/git-merge.txt
Documentation/git-rebase.txt
Documentation/git-rerere.txt
Documentation/git-reset.txt
Documentation/git-revert.txt
Documentation/git-stash.txt
Documentation/git.txt
Documentation/gitattributes.txt
Documentation/githooks.txt
Documentation/revisions.txt
Makefile
advice.c
branch.c
branch.h
builtin.h
builtin/am.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/rebase.c
builtin/reset.c
builtin/revert.c
contrib/completion/git-completion.bash
git-add--interactive.perl
git.c
parse-options-cb.c
parse-options.h
sequencer.c
sequencer.h
sha1-name.c
t/t7512-status-help.sh
unpack-trees.c
wt-status.c