Junio C Hamano 9aeaab6811 blame: allow "blame file" in the middle of a conflicted merge ... "git blame file" has always meant "find the origin of each line of the file in the history leading to HEAD, oh by the way, blame the lines that are modified locally to the working tree". This teaches "git blame" that during a conflicted merge, some uncommitted changes may have come from the other history that is being merged. The verify_working_tree_path() function introduced in the previous patch to notice a typo in the filename (primarily on case insensitive filesystems) has been updated to allow a filename that does not exist in HEAD (i.e. the tip of our history) as long as it exists one of the commits being merged, so that a "we deleted, the other side modified" case tracks the history of the file in the history of the other side. Signed-off-by: Junio C Hamano <gitster@pobox.com>		2012-09-11 14:30:03 -07:00
..
add.c	Merge branch 'js/add-e-submodule-fix' into maint	2012-02-13 11:42:18 -08:00
annotate.c
apply.c	Use correct grammar in diffstat summary line	2012-02-03 23:19:42 -08:00
archive.c
bisect--helper.c
blame.c	blame: allow "blame file" in the middle of a conflicted merge	2012-09-11 14:30:03 -07:00
branch.c	Merge branch 'cn/maint-branch-with-bad' into maint	2012-03-04 22:17:52 -08:00
bundle.c
cat-file.c	drop odd return value semantics from userdiff_config	2012-02-07 10:44:54 -08:00
check-attr.c	Merge branch 'bc/attr-ignore-case'	2011-10-17 21:37:14 -07:00
check-ref-format.c
checkout-index.c
checkout.c	checkout: no progress messages if !isatty(2).	2012-05-24 11:29:07 -07:00
clean.c
clone.c	Merge branch 'ef/maint-1.7.6-clone-progress-fix' into ef/maint-clone-progress-fix	2012-05-07 12:35:36 -07:00
commit-tree.c	Merge branch 'jc/show-sig'	2012-01-06 12:44:07 -08:00
commit.c	status: respect "-b" for porcelain format	2012-05-08 04:51:08 -04:00
config.c	config: remove useless assignment	2012-03-28 15:19:17 -07:00
count-objects.c
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c	drop casts from users EMPTY_TREE_SHA1_BIN	2012-03-23 13:52:05 -07:00
fast-export.c	Merge branch 'js/maint-fast-export-mark-error' into maint	2012-06-17 14:00:03 -07:00
fetch-pack.c	Merge branch 'it/fetch-pack-many-refs' into maint	2012-05-01 21:12:36 -07:00
fetch.c	Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint	2012-05-03 15:29:25 -07:00
fmt-merge-msg.c	fmt-merge-message: add empty line between tag and signature verification	2012-05-25 11:24:08 -07:00
for-each-ref.c
fsck.c	fsck: --no-dangling omits "dangling object" information	2012-02-28 14:55:39 -08:00
gc.c	gc: use argv-array for sub-commands	2012-04-18 16:17:42 -07:00
grep.c	Merge branch 'rs/maint-grep-F' into maint	2012-06-01 13:01:41 -07:00
hash-object.c
help.c
index-pack.c	index-pack: eliminate unlimited recursion in get_base_data()	2012-01-16 14:34:33 -08:00
init-db.c	builtin/init-db.c: eliminate -Wformat warning on Solaris	2011-12-20 16:02:08 -08:00
log.c	diff --stat: add config option to limit graph width	2012-03-01 09:15:58 -08:00
ls-files.c
ls-remote.c
ls-tree.c
mailinfo.c	mailinfo: with -b, keep space after [foo]	2012-01-16 16:06:57 -08:00
mailsplit.c
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	Merge branch 'jc/merge-reduce-parents-early' into maint	2012-05-03 15:36:15 -07:00
mktag.c
mktree.c
mv.c	Merge branch 'jk/maint-mv' into maint	2011-12-28 11:32:36 -08:00
name-rev.c
notes.c	Merge branch 'nd/war-on-nul-in-commit'	2011-12-22 11:27:26 -08:00
pack-objects.c	gc: do not explode objects which will be immediately pruned	2012-04-11 11:09:49 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c	fix deletion of .git/objects sub-directories in git-prune/repack	2012-03-07 10:24:33 -08:00
prune.c	fix deletion of .git/objects sub-directories in git-prune/repack	2012-03-07 10:24:33 -08:00
push.c	Merge branch 'ct/advise-push-default' into maint	2012-05-11 11:18:43 -07:00
read-tree.c
receive-pack.c	Merge branch 'cb/receive-pack-keep-errors' into maint	2012-02-21 15:14:41 -08:00
reflog.c
remote-ext.c
remote-fd.c
remote.c	Merge branch 'pj/remote-set-branches-usage-fix' into maint	2012-02-27 15:33:33 -08:00
replace.c
rerere.c
reset.c
rev-list.c	Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint	2012-05-14 11:46:16 -07:00
rev-parse.c	rev-parse --show-prefix: add in trailing newline	2012-04-10 09:25:35 -07:00
revert.c	Merge branch 'cc/fix-missing-va-end-in-revert' into maint	2012-05-10 10:32:43 -07:00
rm.c
send-pack.c	teach send-pack about --[no-]progress	2012-05-01 09:40:30 -07:00
shortlog.c
show-branch.c
show-ref.c
stripspace.c
symbolic-ref.c	symbolic-ref --short: abbreviate the output unambiguously	2012-02-27 15:58:36 -08:00
tag.c	Merge branch 'tg/tag-points-at'	2012-02-20 00:15:28 -08:00
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c
var.c
verify-pack.c
verify-tag.c	verify-tag: Parse GPG configuration options.	2012-03-08 14:03:07 -08:00
write-tree.c