diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-09 20:53:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 21:18:18 -0800 |
| commit | e433705dd4dc52c45e5d82b615f07b5a4b27f185 (patch) | |
| tree | f77e638ad72563e19fd597259d7f70acfc5d086f /apply.c | |
| parent | cb93c19365760d939f05d9a3c2ef4499f0d5ce16 (diff) | |
| download | git-e433705dd4dc52c45e5d82b615f07b5a4b27f185.tar.gz git-e433705dd4dc52c45e5d82b615f07b5a4b27f185.tar.xz | |
Documentation: git-apply --no-add
This is a specialized hack to help no-base merges, but other
people might find it useful, so let's document it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'apply.c')
| -rw-r--r-- | apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,7 +27,7 @@ static int no_add = 0; static int show_index_info = 0; static int line_termination = '\n'; static const char apply_usage[] = -"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] <patch>..."; +"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [-z] <patch>..."; /* * For "diff-stat" like behaviour, we keep track of the biggest change |