diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-03 13:49:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-03 13:49:28 -0700 |
| commit | 0ba5a0b3ba34270b2b57b75f4cce8454a7cc5eeb (patch) | |
| tree | aa213172c369a9f33f1db08a13128564d19b791e /gitweb/static/js/javascript-detection.js | |
| parent | 2ad8d496355a9eabdcd1f09a23e34e19afdff33d (diff) | |
| parent | e5ee33e8551fa934862b8cbe50693f4841e7dace (diff) | |
Merge branch 'pw/rebase-skip-final-fix'
Checking out all the paths from HEAD during the last conflicted
step in "git rebase" and continuing would cause the step to be
skipped (which is expected), but leaves MERGE_MSG file behind in
$GIT_DIR and confuses the next "git commit", which has been
corrected.
* pw/rebase-skip-final-fix:
rebase --continue: remove .git/MERGE_MSG
rebase --apply: restore some tests
t3403: fix commit authorship
Diffstat (limited to 'gitweb/static/js/javascript-detection.js')
0 files changed, 0 insertions, 0 deletions