Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge-ort: turn submodule conflict suggestions into an advice | Philippe Blain | 2024-02-26 | 1 | -1/+1 |
* | Merge branch 'ab/avoid-losing-exit-codes-in-tests' | Junio C Hamano | 2023-03-19 | 1 | -6/+17 |
|\ | |||||
| * | tests: don't lose exit status with "test <op> $(git ...)" | Ævar Arnfjörð Bjarmason | 2023-02-07 | 1 | -3/+6 |
| * | tests: don't lose exit status with "(cd ...; test <op> $(git ...))" | Ævar Arnfjörð Bjarmason | 2023-02-07 | 1 | -3/+11 |
* | | sequencer API users: fix get_replay_opts() leaks | Ævar Arnfjörð Bjarmason | 2023-02-07 | 1 | -0/+1 |
|/ | |||||
* | submodule merge: update conflict error message | Calvin Wan | 2022-08-04 | 1 | -2/+7 |
* | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-02-01 | 1 | -2/+28 |
* | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 2008-07-13 | 1 | -1/+1 |
* | Ignore dirty submodule states during rebase and stash | Johannes Schindelin | 2008-05-16 | 1 | -0/+92 |