| commit | 80ea984da6c585ca4d63de0d8a2ce2873448e228 | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Fri, 29 May 2015 11:44:45 +0000 (29 19:44 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 May 2015 16:16:11 +0000 (29 09:16 -0700) | ||
| tree | 31619eddc42a15d0afdd3dc39eedb248691a76a2 | treesnapshot (tar.gz zip) |
| parent | 5504f13a7c1e0a0ed486aecfdcc45b150528693e | commitdiff |
t5520: check reflog action in fast-forward merge
When testing a fast-forward merge with git-pull, check to see if the
reflog action is "pull" with the arguments passed to git-pull.
While we are in the vicinity, remove the empty line as well.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When testing a fast-forward merge with git-pull, check to see if the
reflog action is "pull" with the arguments passed to git-pull.
While we are in the vicinity, remove the empty line as well.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5520-pull.sh | diffblobblamehistory |