diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
| commit | e98f80f50bf9b78aab8cea6184fd708259d0c3b3 (patch) | |
| tree | 71457289ee60e6a80b14ab867c987b16f637eb3b /builtin-merge-file.c | |
| parent | Merge remote branch 'remotes/trast-doc/for-next' (diff) | |
| parent | rm: only refresh entries that we may touch (diff) | |
| download | git-e98f80f50bf9b78aab8cea6184fd708259d0c3b3.tar.gz git-e98f80f50bf9b78aab8cea6184fd708259d0c3b3.zip | |
Merge branch 'nd/status-partial-refresh'
* nd/status-partial-refresh:
rm: only refresh entries that we may touch
status: only touch path we may need to check
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions