gistfile1.txt

git pull --ff-only

# Checkout the branch and look at the graph
git daliwang/lnd/shared_after_rebase
git log --oneline --decorate --graph

# Checkout the master as of April 7, at commit b6af438
git checkout b6af438

# Create a new branch
git checkout -b daliwang/lnd/shared_after_rebase_v2

# Pick the commits the valid commits from daliwang/lnd/shared_after_rebase
git cherry-pick c614f73 
git cherry-pick dd8098f 
git cherry-pick 50a909b 
git cherry-pick fcf74d0 
git cherry-pick 4e8414a 
git cherry-pick 3762356 
git cherry-pick f9a69ea 
git cherry-pick 37e165a 
git cherry-pick 7d5698a 
git cherry-pick 80ce38d 

# View the graph
git log --oneline --decorate --graph