diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:36:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:36:51 -0800 |
| commit | 6aa6a92fb61f0ba295b349222b8966c46ef0ba58 (patch) | |
| tree | 36d0f2610e844d52d269ee3845219b928f5e31a8 /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'jl/add-p-reverse-message' into maint (diff) | |
| parent | cherry-pick/revert: transparently refresh index (diff) | |
| download | tgif-6aa6a92fb61f0ba295b349222b8966c46ef0ba58.tar.xz | |
Merge branch 'jn/cherry-pick-refresh-index' into maint
* jn/cherry-pick-refresh-index:
cherry-pick/revert: transparently refresh index
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions