diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:57:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:57:49 -0700 |
| commit | e9f1878da7be816042c915cdf0542f9325c36209 (patch) | |
| tree | 5acea99febe456515699d1d7cd6176be3a0d5b13 /builtin/merge-ours.c | |
| parent | Merge branch 'jc/pack-objects-bigfile' into maint (diff) | |
| parent | stash: ensure --no-keep-index and --patch can be used in any order (diff) | |
| download | tgif-e9f1878da7be816042c915cdf0542f9325c36209.tar.xz | |
Merge branch 'dm/stash-k-i-p' into maint
* dm/stash-k-i-p:
stash: ensure --no-keep-index and --patch can be used in any order
stash: add two more tests for --no-keep-index
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions