summaryrefslogtreecommitdiff
path: root/b4-wrapper.sh
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-05-25 15:22:30 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-05-25 15:22:30 -0400
commit59be08453137a3b9c6a25dc6787b5066a88a84cd (patch)
treedfc5acde52c5cd72895dcd9af7c46260f2a11e1a /b4-wrapper.sh
parent34bcb457865d0b58e08486b2ceb80e9067717e60 (diff)
downloadb4-59be08453137a3b9c6a25dc6787b5066a88a84cd.tar.gz
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 <konstantin@linuxfoundation.org>
Diffstat (limited to 'b4-wrapper.sh')
0 files changed, 0 insertions, 0 deletions