diff options
| author |  Dan McGee <dpmcgee@gmail.com> | 2011-04-07 12:04:20 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-04-07 15:54:04 -0700 |
| commit | 3a243f7024f21c2c2205cd861f3bb756b0ec43a0 (patch) | |
| tree | cafd7dd35224d007d7b249c94ca439b61f6a46ae /builtin/merge-file.c | |
| parent | stash: add two more tests for --no-keep-index (diff) | |
| download | tgif-3a243f7024f21c2c2205cd861f3bb756b0ec43a0.tar.xz | |
stash: ensure --no-keep-index and --patch can be used in any order
Don't assume one comes after the other on the command line. Use a
three-state variable to track and check its value accordingly.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions