git/builtin, branch v1.7.2

Merge branch 'jl/add-n-ignore-missing'

2010-07-19T18:09:38Z

* jl/add-n-ignore-missing: git add: Add the "--ignore-missing" option for the dry run

Merge branch 'jc/diff-merge-base-multi'

2010-07-16T22:45:35Z

* jc/diff-merge-base-multi: diff A...B: do not limit the syntax too narrowly

Merge branch 'wp/merge-tree-fix'

2010-07-15T19:08:41Z

* wp/merge-tree-fix: merge-tree: fix where two branches share no changes add basic tests for merge-tree

Merge branch 'js/merge-rr-fix'

2010-07-15T19:08:36Z

* js/merge-rr-fix: MERGE_RR is in .git, not .git/rr-cache

Merge branch 'jc/diff-merge-base-multi'

2010-07-15T19:08:25Z

* jc/diff-merge-base-multi: diff A...B: give one possible diff when there are more than one merge-base

Merge branch 'jn/grep-open'

2010-07-15T19:07:18Z

* jn/grep-open: grep -O: Do not pass color sequences as filenames to pager

Merge branch 'jk/maint-status-keep-index-timestamp'

2010-07-15T19:06:55Z

* jk/maint-status-keep-index-timestamp: do not write out index when status does not have to

MERGE_RR is in .git, not .git/rr-cache

2010-07-14T20:04:25Z

0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the location of MERGE_RR but I found a few references to the old location. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano

merge-tree: fix where two branches share no changes

2010-07-14T19:56:49Z

15b4f7a (merge-tree: use ll_merge() not xdl_merge(), 2010-01-16) introduced a regression to merge-tree to cause it to segfault when merging files which existed in one branch, but not in the other or in the merge-base. This was caused by referencing entry->path at a time when entry was known to be possibly-NULL. To correct the problem, we save the path of the entry we came in with, as the path should be the same among all the stages no matter which sides are involved in the merge. Signed-off-by: Will Palmer Signed-off-by: Junio C Hamano

git add: Add the "--ignore-missing" option for the dry run

2010-07-12T22:13:54Z

Sometimes it is useful to know if a file or directory will be ignored before it is added to the work tree. An example is "git submodule add", where it would be really nice to be able to fail with an appropriate error message before the submodule is cloned and checked out. Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano