diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2010-06-01 03:35:49 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-02 09:15:38 -0700 |
commit | 5853caec96a45ffa7768585acc649dc78eb99354 (patch) | |
tree | 0839036b74911cdde555f90637b02fc43fb841bc /builtin/add.c | |
parent | Merge branch 'maint' (diff) | |
download | tgif-5853caec96a45ffa7768585acc649dc78eb99354.tar.xz |
DWIM 'git show -5' to 'git show --do-walk -5'
To show the last two commits with one command, one might try
1) git show -s master~2..
2) git show -s ^master~2 master
3) git show -s master^ master
4) git show -s -2 master
Choice (3) works because both commits are listed on the command line.
Choices (1) and (2) have worked ever since v1.6.4-rc~3 (Make 'git
show' more useful, 2009-07-13) disabled --no-walk in this case because
there is no other useful meaning for them to have. Unfortunately, (4)
does not work: it outputs only one commit, because --no-walk stays on.
So disable --no-walk in this case so ‘git show’ and future ‘git
cherry-pick’ can behave as expected.
As a side effect, this unfortunately changes the meaning of
‘git log --oneline --decorate --no-walk -5 --all’: instead of listing
five refs, after this patch that command would list the five most
recent commits.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/add.c')
0 files changed, 0 insertions, 0 deletions