From 59be08453137a3b9c6a25dc6787b5066a88a84cd Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Mon, 25 May 2020 15:22:30 -0400 Subject: Add -3 to "b4 am" to prep for a 3way merge The original code used for b4 diff was to prepare for a 3-way merge by making sure that all blob indexes exist in the local repo. Add this functionality to "b4 am" and document all the features added in the 0.5.0 branch. Signed-off-by: Konstantin Ryabitsev --- b4/command.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'b4/command.py') diff --git a/b4/command.py b/b4/command.py index 2964f54..d0d084e 100644 --- a/b4/command.py +++ b/b4/command.py @@ -108,6 +108,9 @@ def cmd(): '"-P *globbing*" to match on commit subject)') sp_am.add_argument('-g', '--guess-base', dest='guessbase', action='store_true', default=False, help='Try to guess the base of the series (if not specified)') + sp_am.add_argument('-3', '--prep-3way', dest='threeway', action='store_true', default=False, + help='Prepare for a 3-way merge ' + '(tries to ensure that all index blobs exist by making a fake commit range)') sp_am.set_defaults(func=cmd_am) # b4 attest -- cgit v1.2.3