You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Junio C Hamano
933e44d3a0
"add -p": work-around an old laziness that does not coalesce hunks
...
Since 0beee4c
(git-add--interactive: remove hunk coalescing, 2008-07-02),
"git add--interactive" behaves lazily and passes overlapping hunks to the
underlying "git apply" without coalescing. This was partially corrected
by 7a26e65
(its partial revert, 2009-05-16), but overlapping hunks are
still passed when the patch is edited.
Teach "git apply" the --allow-overlap option that disables a safety
feature that avoids misapplication of patches by not applying patches
to overlapping hunks, and pass this option form "add -p" codepath.
Do not even advertise the option, as this is merely a workaround, and the
correct fix is to make "add -p" correctly coalesce adjacent patch hunks.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 years ago
..
add.c
add: describe --patch like checkout, reset
14 years ago
annotate.c
…
apply.c
"add -p": work-around an old laziness that does not coalesce hunks
14 years ago
archive.c
…
bisect--helper.c
…
blame.c
Merge branch 'jn/parse-options-extra'
14 years ago
branch.c
branch_merged: fix grammar in warning
14 years ago
bundle.c
…
cat-file.c
…
check-attr.c
…
check-ref-format.c
…
checkout-index.c
Merge branch 'jn/git-cmd-h-bypass-setup'
14 years ago
checkout.c
correct type of EMPTY_TREE_SHA1_BIN
14 years ago
clean.c
Merge branch 'rs/opt-help-text'
14 years ago
clone.c
clone,init: describe --template using the same wording
14 years ago
commit-tree.c
…
commit.c
commit,status: describe -u likewise
14 years ago
config.c
…
count-objects.c
…
describe.c
Merge branch 'tf/commit-list-prefix'
14 years ago
diff-files.c
…
diff-index.c
…
diff-tree.c
…
diff.c
diff: support --cached on unborn branches
14 years ago
fast-export.c
…
fetch-pack.c
commit: Add commit_list prefix in two function names.
14 years ago
fetch.c
Merge branch 'jl/fetch-submodule-recursive'
14 years ago
fmt-merge-msg.c
…
for-each-ref.c
…
fsck.c
fsck: do not give up too early in fsck_dir()
14 years ago
gc.c
Merge branch 'jn/git-cmd-h-bypass-setup'
14 years ago
grep.c
thread-utils.h: simplify the inclusion
14 years ago
hash-object.c
…
help.c
…
index-pack.c
…
init-db.c
init: remove unnecessary check
14 years ago
log.c
Merge branch 'tc/format-patch-p'
14 years ago
ls-files.c
Merge branch 'jn/git-cmd-h-bypass-setup'
14 years ago
ls-remote.c
…
ls-tree.c
…
mailinfo.c
…
mailsplit.c
…
merge-base.c
…
merge-file.c
Merge branch 'rs/opt-help-text'
14 years ago
merge-index.c
…
merge-ours.c
…
merge-recursive.c
…
merge-tree.c
…
merge.c
commit,merge,tag: describe -m likewise
14 years ago
mktag.c
…
mktree.c
…
mv.c
…
name-rev.c
…
notes.c
Merge branch 'jh/notes-merge'
14 years ago
pack-objects.c
thread-utils.h: simplify the inclusion
14 years ago
pack-redundant.c
…
pack-refs.c
…
patch-id.c
…
prune-packed.c
…
prune.c
…
push.c
…
read-tree.c
…
receive-pack.c
…
reflog.c
…
remote-ext.c
remote-ext: do not segfault for blank lines
14 years ago
remote-fd.c
remote-fd/ext: finishing touches after code review
14 years ago
remote.c
Merge branch 'rs/opt-help-text'
14 years ago
replace.c
…
rerere.c
…
reset.c
…
rev-list.c
Merge branch 'jk/maint-rev-list-nul' into maint
14 years ago
rev-parse.c
…
revert.c
Merge branch 'jn/cherry-pick-refresh-index' into maint
14 years ago
rm.c
builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
14 years ago
send-pack.c
Merge branch 'jk/push-progress'
14 years ago
shortlog.c
parse-options: Don't call parse_options_check() so much
14 years ago
show-branch.c
commit: Add commit_list prefix in two function names.
14 years ago
show-ref.c
…
stripspace.c
…
symbolic-ref.c
…
tag.c
commit,merge,tag: describe -m likewise
14 years ago
tar-tree.c
…
unpack-file.c
…
unpack-objects.c
…
update-index.c
Merge branch 'jn/parse-options-extra'
14 years ago
update-ref.c
…
update-server-info.c
…
upload-archive.c
…
var.c
…
verify-pack.c
…
verify-tag.c
Merge branch 'mg/maint-tag-rfc1991'
14 years ago
write-tree.c
…