diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-26 20:13:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-26 20:13:16 -0700 |
| commit | 149971badc562f4e5ee66c045f40c904fb29eab6 (patch) | |
| tree | 020dbffb91e75d4a001bffe52c804018ca2f1e66 /builtin/merge-recursive.c | |
| parent | Merge branch 'jk/checkout-orphan-warning' (diff) | |
| parent | update $GIT_INDEX_FILE when there are racily clean entries (diff) | |
| download | tgif-149971badc562f4e5ee66c045f40c904fb29eab6.tar.xz | |
Merge branch 'jc/index-update-if-able'
* jc/index-update-if-able:
update $GIT_INDEX_FILE when there are racily clean entries
diff/status: refactor opportunistic index update
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions