git/builtin at 088018e34d705aad696acfeb624cfe5552ba256f - git

History

Eric Sunshine 088018e34d restore: default to HEAD when combining --staged and --worktree By default, files are restored from the index for --worktree, and from HEAD for --staged. When --worktree and --staged are combined, --source must be specified to disambiguate the restore source[1], thus making it cumbersome to restore a file in both the worktree and the index. However, HEAD is also a reasonable default for --worktree when combined with --staged, so make it the default anytime --staged is used (whether combined with --worktree or not). [1]: Due to an oversight, the --source requirement, though documented, is not actually enforced. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		5 years ago
..
add.c	Merge branch 'hw/advice-add-nothing'	5 years ago
am.c	am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch	5 years ago
annotate.c	…
apply.c	…
archive.c	…
bisect--helper.c	bisect: libify `check_good_are_ancestors_of_bad` and its dependents	5 years ago
blame.c	Merge branch 'sg/blame-indent-heuristics-is-now-the-default'	5 years ago
branch.c	l10n: minor case fix in 'git branch' '--unset-upstream' description	5 years ago
bundle.c	…
cat-file.c	packed_object_info(): use object_id for returning delta base	5 years ago
check-attr.c	…
check-ignore.c	check-ignore: fix documentation and implementation to match	5 years ago
check-mailmap.c	…
check-ref-format.c	…
checkout-index.c	…
checkout.c	restore: default to HEAD when combining --staged and --worktree	5 years ago
clean.c	…
clone.c	Merge branch 'es/recursive-single-branch-clone'	5 years ago
column.c	…
commit-graph.c	commit-graph.h: use odb in 'load_commit_graph_one_fd_st'	5 years ago
commit-tree.c	…
commit.c	Merge branch 'tb/commit-graph-object-dir'	5 years ago
config.c	config: add '--show-scope' to print the scope of a config value	5 years ago
count-objects.c	…
credential.c	…
describe.c	describe: don't abort too early when searching tags	5 years ago
diff-files.c	…
diff-index.c	…
diff-tree.c	…
diff.c	…
difftool.c	…
env--helper.c	…
fast-export.c	Merge branch 'mt/use-passed-repo-more-in-funcs'	5 years ago
fetch-pack.c	…
fetch.c	Merge branch 'ds/partial-clone-fixes'	5 years ago
fmt-merge-msg.c	Merge branch 'hi/gpg-use-check-signature'	5 years ago
for-each-ref.c	…
fsck.c	…
gc.c	commit-graph.h: store an odb in 'struct write_commit_graph_context'	5 years ago
get-tar-commit-id.c	…
grep.c	Merge branch 'mt/threaded-grep-in-object-store'	5 years ago
hash-object.c	…
help.c	…
index-pack.c	Merge branch 'jk/index-pack-dupfix'	5 years ago
init-db.c	…
interpret-trailers.c	…
log.c	Merge branch 'dl/format-patch-notes-config-fixup'	5 years ago
ls-files.c	…
ls-remote.c	…
ls-tree.c	…
mailinfo.c	…
mailsplit.c	…
merge-base.c	…
merge-file.c	…
merge-index.c	…
merge-ours.c	…
merge-recursive.c	…
merge-tree.c	…
merge.c	gpg-interface: add minTrustLevel as a configuration option	5 years ago
mktag.c	sha1-file: allow check_object_signature() to handle any repo	5 years ago
mktree.c	…
multi-pack-index.c	…
mv.c	…
name-rev.c	name-rev: sort tip names before applying	5 years ago
notes.c	strbuf: add and use strbuf_insertstr()	5 years ago
pack-objects.c	Merge branch 'jk/nth-packed-object-id'	5 years ago
pack-redundant.c	…
pack-refs.c	…
patch-id.c	patch-id: use oid_to_hex() to print multiple object IDs	5 years ago
prune-packed.c	…
prune.c	…
pull.c	Merge branch 'bw/remote-rename-update-config'	5 years ago
push.c	…
range-diff.c	range-diff: clear `other_arg` at end of function	5 years ago
read-tree.c	…
rebase.c	Merge branch 'en/rebase-backend'	5 years ago
receive-pack.c	receive.denyCurrentBranch: respect all worktrees	5 years ago
reflog.c	C: use skip_prefix() to avoid hardcoded string length	5 years ago
remote-ext.c	…
remote-fd.c	…
remote.c	remote rename/remove: gently handle remote.pushDefault config	5 years ago
repack.c	…
replace.c	sha1-file: pass git_hash_algo to hash_object_file()	5 years ago
rerere.c	…
reset.c	Merge branch 'am/pathspec-from-file'	5 years ago
rev-list.c	rev-list --count: comment on the use of count_right++	5 years ago
rev-parse.c	…
revert.c	…
rm.c	rm: support the --pathspec-from-file option	5 years ago
send-pack.c	…
shortlog.c	…
show-branch.c	use strpbrk(3) to search for characters from a given set	5 years ago
show-index.c	…
show-ref.c	…
sparse-checkout.c	Merge branch 'ds/sparse-add'	5 years ago
stash.c	Merge branch 'am/pathspec-f-f-more'	5 years ago
stripspace.c	…
submodule--helper.c	Merge branch 'es/recursive-single-branch-clone'	5 years ago
symbolic-ref.c	…
tag.c	…
unpack-file.c	…
unpack-objects.c	sha1-file: pass git_hash_algo to hash_object_file()	5 years ago
update-index.c	…
update-ref.c	…
update-server-info.c	…
upload-archive.c	…
upload-pack.c	…
var.c	…
verify-commit.c	…
verify-pack.c	…
verify-tag.c	…
worktree.c	worktree: don't allow "add" validation to be fooled by suffix matching	5 years ago
write-tree.c	…