X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/539fb2921209bd3fd6165baa057f76f474aa5cb4..06848faba60e1c4e637b15b608e5bd94989c4196:/stgit/commands/log.py diff --git a/stgit/commands/log.py b/stgit/commands/log.py index 033c797..a21789e 100644 --- a/stgit/commands/log.py +++ b/stgit/commands/log.py @@ -36,10 +36,11 @@ can be one of the following: push(f) - the patch was fast-forwarded undo - the patch boundaries were restored to the old values -Note that only the diffs shown in the 'refresh' and 'undo' actions are -meaningful for the patch changes. The 'push' actions represent the -changes to the entire base of the current patch. Conflicts reset the -patch content and a subsequent 'refresh' will show the entire patch.""" +Note that only the diffs shown in the 'refresh', 'undo' and 'sync' +actions are meaningful for the patch changes. The 'push' actions +represent the changes to the entire base of the current +patch. Conflicts reset the patch content and a subsequent 'refresh' +will show the entire patch.""" options = [make_option('-b', '--branch', help = 'use BRANCH instead of the default one'), @@ -59,7 +60,8 @@ def show_log(log, show_patch): descr = commit.get_log().rstrip() if show_patch: - if descr.startswith('refresh') or descr.startswith('undo'): + if descr.startswith('refresh') or descr.startswith('undo') \ + or descr.startswith('sync'): diff_str = '%s%s\n' % (diff_str, git.pretty_commit(commit.get_id_hash())) else: