diff options
| author |  Timo Hirvonen <tihirvon@gmail.com> | 2006-06-24 20:26:49 +0300 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-07-01 22:26:00 -0700 |
| commit | d7de00f7e0d2374cb7933d2ee1ebe5273a8acf53 (patch) | |
| tree | a20cc9cd457c295ba7f13a83693f7324a17ced3d /git-merge-one-file.sh | |
| parent | builtin-diff: turn recursive on when defaulting to --patch format. (diff) | |
| download | tgif-d7de00f7e0d2374cb7933d2ee1ebe5273a8acf53.tar.xz | |
--name-only, --name-status, --check and -s are mutually exclusive
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions