summaryrefslogtreecommitdiff
path: root/git-gui/po
diff options
context:
space:
mode:
authorLibravatar Paul Tan <pyokagan@gmail.com>2015-05-29 19:44:45 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-29 09:16:11 -0700
commit80ea984da6c585ca4d63de0d8a2ce2873448e228 (patch)
tree31619eddc42a15d0afdd3dc39eedb248691a76a2 /git-gui/po
parentt5521: test --dry-run does not make any changes (diff)
downloadtgif-80ea984da6c585ca4d63de0d8a2ce2873448e228.tar.xz
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>
Diffstat (limited to 'git-gui/po')
0 files changed, 0 insertions, 0 deletions