diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-09 23:36:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 10:52:38 -0800 |
| commit | 9ce7028531fd7ce1ca8d75a5c4f9a941ef79c9d4 (patch) | |
| tree | 92d355f00fca724483afc0053f156fd8f3e794d4 /git-merge-recursive.py | |
| parent | RPM: arch submodule needs tla. (diff) | |
| download | git-9ce7028531fd7ce1ca8d75a5c4f9a941ef79c9d4.tar.gz git-9ce7028531fd7ce1ca8d75a5c4f9a941ef79c9d4.zip | |
git-show-branch: tighten merge-base computation.
This makes the merge-base computation resistant to the pathological
case discussed on the list earlier, by doing the same logic as
git-merge-base. As a side effect, it breaks the command's primary
function to list non-merge commit sequences, which needs to be fixed
separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions