Comments (1)
Never mind, I wrote a script to do it:
#!/bin/bash
git fetch > /dev/null 2>&1 &
ls_files=$(git diff --name-only --diff-filter=U)
np=$(nproc)
if [ -z "$ls_files" ]; then
echo "No conflicts here!"
exit 0
fi
task() {
for i in $(git blame $i | awk '/<<<</,/>>>>/' | awk '{print $1}' | grep -v 0000 | sort | uniq); do
if [ $(git branch -r --contains $i | grep -c "$1$\|$2$") -lt 2 ]; then
git log --no-walk --pretty=format:"%h%x09%an%x09%ad%x09%s" $i | cut -c 1-80
fi
done
}
for i in $(echo $ls_files); do
# Max 16 processes at any given time
while [ $(jobs -r -p | wc -l) -gt $np ]; do
sleep 1
done
task $1 $2&
done
wait
Sorry for bothering you, you have to pass in the two branches to this
from git-imerge.
Related Issues (20)
- Interactive Rebase With History Preserving Past Merges HOT 1
- Skip incompatible merges HOT 1
- Exact equivalent of `git rebase --onto ancient origin/ancient modern` ? HOT 2
- Error: untracked working tree files aborts imerge HOT 6
- Why autofills if automerge succeeds? HOT 2
- Merging a branch that has merge commits HOT 1
- non-zero exit status 128 HOT 2
- Is it possible to redo parts of an iterative merge? HOT 4
- add a stop, abort, or similar command HOT 5
- Cannot proceed dead lock ( maybe related to `git lfs` in history? ) HOT 2
- [Question] why is such a feature not integrated in git main? HOT 1
- How to manually cleanup in case of a crash? HOT 4
- [Request] Keep diff3 conflictstyle as clear as without imerge HOT 3
- Automate ability to extend merge when source branches are updated HOT 3
- Stuck in a merge, imerge crashes when attempting to continue HOT 2
- backtracking repeats unrelated autofills
- possibility of merging unrelated histories
- add support for new Python `pyproject.toml` standard: `setup.py install` is deprecated
- Question: can git-imerge product a list of all conflicts in advance and their associated commits? HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from git-imerge.