Skip to content

Commit

Permalink
Merge pull request #498 from dniku/master
Browse files Browse the repository at this point in the history
Parse rename metadata CLI parameter
  • Loading branch information
vidartf committed Aug 31, 2019
2 parents cdadb44 + e114af0 commit a9faba1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion nbdime/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ def add_filter_args(diff_parser):

def add_git_diff_driver_args(diff_parser):
"""Adds a set of 7 stanard git diff driver arguments:
path old-file old-hex old-mode new-file new-hex new-mode [ rename-to ]
path old-file old-hex old-mode new-file new-hex new-mode [ rename-to rename-metadata ]
Note: Only path, base and remote are added to parsed namespace
"""
Expand All @@ -380,6 +380,7 @@ def add_git_diff_driver_args(diff_parser):
diff_parser.add_argument('remote_sha1', nargs='?', default=None, action=SkipAction)
diff_parser.add_argument('remote_mode', nargs='?', default=None, action=SkipAction)
diff_parser.add_argument('rename_to', type=Path, nargs='?', default=None, action=SkipAction)
diff_parser.add_argument('rename_metadata', type=Path, nargs='?', default=None, action=SkipAction)


def process_diff_flags(args):
Expand Down

0 comments on commit a9faba1

Please sign in to comment.