diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:28:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:28:31 -0700 |
| commit | e40b34b1ec2c91aaed5572116cd8d01afff7851f (patch) | |
| tree | fe592011faace9f63915472f2ab791ca0428d74a /merge-file.c | |
| parent | 613e4e5f4046ee36f40199cbaeb9f35442d24378 (diff) | |
| parent | 5adba90d941cdce2aa32ff5b6f562daebef8c2e4 (diff) | |
| download | git-e40b34b1ec2c91aaed5572116cd8d01afff7851f.tar.gz | |
Merge branch 'mm/shortopt-detached'
* mm/shortopt-detached:
log: parse separate option for --glob
log: parse separate options like git log --grep foo
diff: parse separate options --stat-width n, --stat-name-width n
diff: split off a function for --stat-* option parsing
diff: parse separate options like -S foo
Conflicts:
revision.c
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions