Nguyễn Thái Ngọc Duy b4b313f94a reset: support "--mixed --intent-to-add" mode ...

When --mixed is used, entries could be removed from index if the
target ref does not have them. When "reset" is used in preparation for
commit spliting (in a dirty worktree), it could be hard to track what
files to be added back. The new option --intent-to-add simplifies it
by marking all removed files intent-to-add.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

2014-02-05 16:44:51 -08:00

..

add.c

Merge branch 'nd/add-empty-fix'

2014-01-10 10:33:03 -08:00

annotate.c

…

apply.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

bisect--helper.c

…

blame.c

Merge branch 'js/lift-parent-count-limit'

2014-01-10 10:33:36 -08:00

branch.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

bundle.c

…

cat-file.c

Merge branch 'jk/oi-delta-base'

2014-01-10 10:33:11 -08:00

check-attr.c

…

check-ignore.c

Merge branch 'dw/check-ignore-sans-index'

2013-09-20 12:37:32 -07:00

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

Merge branch 'nd/lift-path-max'

2013-10-30 12:10:56 -07:00

checkout.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

clean.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

clone.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

column.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

commit-tree.c

…

commit.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

config.c

repo-config: remove deprecated alias for "git config"

2013-11-12 14:10:17 -08:00

count-objects.c

…

credential.c

…

describe.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'tg/diff-no-index-refactor'

2013-12-27 14:58:17 -08:00

fast-export.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

fetch-pack.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

fetch.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

fmt-merge-msg.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

for-each-ref.c

Merge branch 'maint'

2013-12-30 12:27:01 -08:00

fsck.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

gc.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

get-tar-commit-id.c

stop installing git-tar-tree link

2013-12-03 12:35:22 -08:00

grep.c

Merge branch 'mg/more-textconv'

2013-10-23 13:21:31 -07:00

hash-object.c

…

help.c

builtin/help.c: speed up is_git_command() by checking for builtin commands first

2014-01-06 11:26:31 -08:00

index-pack.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

init-db.c

Merge branch 'mh/safe-create-leading-directories'

2014-01-27 10:45:33 -08:00

log.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

ls-files.c

Merge branch 'jc/ls-files-killed-optim' into maint

2013-10-23 13:33:08 -07:00

ls-remote.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

ls-tree.c

…

mailinfo.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

mailsplit.c

…

merge-base.c

Merge branch 'bm/merge-base-octopus-dedup'

2014-01-10 10:33:33 -08:00

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

merge-tree.c

…

merge.c

Merge branch 'ef/mingw-write'

2014-01-27 10:44:59 -08:00

mktag.c

…

mktree.c

…

mv.c

mv: let 'git mv file no-such-dir/' error out on Windows, too

2014-01-10 11:28:12 -08:00

name-rev.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

notes.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

pack-objects.c

do not pretend sha1write returns errors

2013-12-26 11:50:20 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

prune-packed: use strbuf to avoid having to worry about PATH_MAX

2013-12-17 10:43:30 -08:00

prune.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

push.c

Merge branch 'jc/push-refmap'

2013-12-27 14:57:50 -08:00

read-tree.c

C: have space around && and || operators

2013-10-16 10:26:39 -07:00

receive-pack.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

reflog.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

repack.c

Merge branch 'sb/repack-in-c'

2014-01-27 10:45:49 -08:00

replace.c

replace info: rename 'full' to 'long' and clarify in-code symbols

2013-12-30 12:33:11 -08:00

rerere.c

…

reset.c

reset: support "--mixed --intent-to-add" mode

2014-02-05 16:44:51 -08:00

rev-list.c

C: have space around && and || operators

2013-10-16 10:26:39 -07:00

rev-parse.c

Merge branch 'jk/rev-parse-double-dashes'

2013-12-27 14:58:01 -08:00

revert.c

Merge branch 'hu/cherry-pick-previous-branch'

2013-10-23 13:21:35 -07:00

rm.c

rm: re-use parse_pathspec's trailing-slash removal

2013-09-13 12:37:35 -07:00

send-pack.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

shortlog.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

show-branch.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

show-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

stripspace.c

…

symbolic-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

tag.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

unpack-file.c

…

unpack-objects.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

update-index.c

…

update-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

update-server-info.c

…

upload-archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…