diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-06-14 07:33:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-14 07:33:27 +0300 |
| commit | 8e444e66df45ee5bbe84af0d884c6625627219f3 (patch) | |
| tree | 49dfc39c29fa972df26bfe933d934fd8633038c7 /builtin/stash.c | |
| parent | 169914ede2aa205c5500c7be0501889a8962dc24 (diff) | |
| parent | f5bfcc823ba242a46e20fb6f71c9fbf7ebb222fe (diff) | |
Merge branch 'so/log-m-implies-p'
The "-m" option in "git log -m" that does not specify which format,
if any, of diff is desired did not have any visible effect; it now
implies some form of diff (by default "--patch") is produced.
* so/log-m-implies-p:
diff-merges: let "-m" imply "-p"
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
stash list: stop passing "-m" to "git log"
git-svn: stop passing "-m" to "git rev-list"
diff-merges: move specific diff-index "-m" handling to diff-index
t4013: test "git diff-index -m"
t4013: test "git diff-tree -m"
t4013: test "git log -m --stat"
t4013: test "git log -m --raw"
t4013: test that "-m" alone has no effect in "git log"
Diffstat (limited to 'builtin/stash.c')
| -rw-r--r-- | builtin/stash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index d163fb66d2..9c72e4b125 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -761,7 +761,7 @@ static int list_stash(int argc, const char **argv, const char *prefix) cp.git_cmd = 1; strvec_pushl(&cp.args, "log", "--format=%gd: %gs", "-g", - "--first-parent", "-m", NULL); + "--first-parent", NULL); strvec_pushv(&cp.args, argv); strvec_push(&cp.args, ref_stash); strvec_push(&cp.args, "--"); |