git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Wed, 27 Jan 2010 06:53:13 +0000 (22:53 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 27 Jan 2010 06:53:13 +0000 (22:53 -0800)
commit	d539de9f25920f099e4e56b0acbb4ebf246ff0f4
tree	8453048a2a8f5a8a84d66e5c8dfd4784bdec49b6	tree \| snapshot
parent	3fa7c3da379bb47a0e7a52ffc13cb366add880a2	commit \| diff
parent	721ceec1ad12625e90b395fd0be0fae9049ebc22	commit \| diff

Merge branch 'jl/diff-submodule-ignore'

* jl/diff-submodule-ignore:
  Teach diff --submodule that modified submodule directory is dirty
  git diff: Don't test submodule dirtiness with --ignore-submodules
  Make ce_uptodate() trustworthy again

diff-lib.c	diff1 \|	diff2 \|	blob \| history
diff.c	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

RSS Atom

diff-lib.c	diff1 \|	diff2 \|	blob \| history
diff.c	diff1 \|	diff2 \|	blob \| history