]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d516c2d b4e1e4a)
Evil Merge branch 'jc/status' (early part) into js/diff-ni
authorJunio C Hamano <junkio@cox.net>
Sat, 24 Feb 2007 10:20:13 +0000 (02:20 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 24 Feb 2007 10:20:13 +0000 (02:20 -0800)
commitefdfd6c8d418a2c12f31cacb50fa8a91b2b868c8
tree93a5eea7b3887a2a58583bf249f1d556019ba418tree | snapshot
parentd516c2d11945cf13ed3d961fa63817c60b7a566bcommit | diff
parentb4e1e4a787d3771f617182b3344dcdd9224bd0cbcommit | diff
Evil Merge branch 'jc/status' (early part) into js/diff-ni

* 'jc/status' (early part):
  run_diff_{files,index}(): update calling convention.
  update-index: do not die too early in a read-only repository.
  git-status: do not be totally useless in a read-only repository.

This is to resolve semantic conflict (which is not textual) that
changes the calling convention of run_diff_files() early.
builtin-diff.c diff1 | diff2 | blob | history
builtin-update-index.c diff1 | diff2 | blob | history
diff-lib.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.