diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:15 -0700 |
| commit | fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2 (patch) | |
| tree | d62ce076a39b37df4caaf93fc10155dd4f86b44d /git-p4.py | |
| parent | 2c30e34e1a50f9d14fce8f97f3639ac0ebccd819 (diff) | |
| parent | 0108f47eb30b9b473e044285b731e2fbca803170 (diff) | |
| download | git-fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2.tar.gz | |
Merge branch 'sw/git-p4-unshelve-branched-files' into maint
"git p4" update.
* sw/git-p4-unshelve-branched-files:
git-p4: allow unshelving of branched files
Diffstat (limited to 'git-p4.py')
| -rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1309,7 +1309,7 @@ class GitLFS(LargeFileSystem): class Command: delete_actions = ( "delete", "move/delete", "purge" ) - add_actions = ( "add", "move/add" ) + add_actions = ( "add", "branch", "move/add" ) def __init__(self): self.usage = "usage: %prog [options]" |