diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:21 -0800 |
| commit | 1e745453fee88b3322b8be05548220c31cf654cd (patch) | |
| tree | 63d872c82f9cd17084f4dd59d784d50f7fda32a8 /builtin/merge-file.c | |
| parent | Merge branch 'nd/submodule-pathspec-ending-with-slash' (diff) | |
| parent | diff: do not quit early on stat-dirty files (diff) | |
| download | tgif-1e745453fee88b3322b8be05548220c31cf654cd.tar.xz | |
Merge branch 'nd/diff-quiet-stat-dirty'
"git diff --quiet -- pathspec1 pathspec2" sometimes did not return
correct status value.
* nd/diff-quiet-stat-dirty:
diff: do not quit early on stat-dirty files
diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions