Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/rebase-count-fixes' into seen | Junio C Hamano | 2023-05-17 | 1 | -5/+8 |
|\ | |||||
| * | rebase -r: fix the total number shown in the progress | Johannes Schindelin | 2023-05-14 | 1 | -3/+6 |
| * | rebase --update-refs: fix loops | Johannes Schindelin | 2023-05-14 | 1 | -2/+2 |
| * | rebase --update-refs: avoid unintended ref deletion | Victoria Dye | 2022-12-09 | 1 | -3/+6 |
| * | Merge branch 'jk/sequencer-missing-author-name-check' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -2/+2 |
| |\ \ | |||||
* | \ \ | Merge branch 'ob/revert-of-revert' into seen | Junio C Hamano | 2023-05-17 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | sequencer: beautify subject of reverts of reverts | Oswald Buddenhagen | 2023-05-05 | 1 | -0/+14 |
* | | | | | Merge branch 'en/header-split-cache-h-part-3' into jch | Junio C Hamano | 2023-05-17 | 1 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | object-store-ll.h: split this header out of object-store.h | Elijah Newren | 2023-05-16 | 1 | -1/+1 |
| * | | | | | repository: remove unnecessary include of path.h | Elijah Newren | 2023-05-16 | 1 | -0/+1 |
| * | | | | | cache.h: remove this no-longer-used header | Elijah Newren | 2023-05-16 | 1 | -1/+1 |
| * | | | | | merge.h: move declarations for merge.c from cache.h | Elijah Newren | 2023-05-16 | 1 | -0/+1 |
| * | | | | | sparse-index.h: move declarations for sparse-index.c from cache.h | Elijah Newren | 2023-05-16 | 1 | -0/+1 |
| * | | | | | Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-pa... | Junio C Hamano | 2023-05-08 | 1 | -0/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'pw/rebase-i-after-failure' into jch | Junio C Hamano | 2023-05-17 | 1 | -80/+90 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase -i: fix adding failed command to the todo list | Phillip Wood | 2023-04-21 | 1 | -6/+6 |
| * | | | | | | rebase: fix rewritten list for failed pick | Phillip Wood | 2023-04-21 | 1 | -12/+7 |
| * | | | | | | rebase --continue: refuse to commit after failed command | Phillip Wood | 2023-04-21 | 1 | -5/+5 |
| * | | | | | | sequencer: factor out part of pick_commits() | Phillip Wood | 2023-04-21 | 1 | -60/+69 |
| * | | | | | | rebase -i: remove patch file after conflict resolution | Phillip Wood | 2023-04-21 | 1 | -2/+7 |
| * | | | | | | rebase -i: move unlink() calls | Phillip Wood | 2023-04-21 | 1 | -3/+4 |
* | | | | | | | Merge branch 'cw/strbuf-cleanup' into jch | Junio C Hamano | 2023-05-17 | 1 | -9/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | strbuf: remove global variable | Calvin Wan | 2023-05-12 | 1 | -9/+15 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ob/messages-capitalize-exception' | Junio C Hamano | 2023-05-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | messages: capitalization and punctuation exceptions | Oswald Buddenhagen | 2023-04-28 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'ob/sequencer-i18n-fix' | Junio C Hamano | 2023-05-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | sequencer: actually translate report in do_exec() | Oswald Buddenhagen | 2023-04-28 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'en/header-split-cache-h-part-2' | Junio C Hamano | 2023-05-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | copy.h: move declarations for copy.c functions from cache.h | Elijah Newren | 2023-04-24 | 1 | -0/+1 |
* | | | | | | | Merge branch 'en/header-split-cache-h' | Junio C Hamano | 2023-04-25 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | |||||
| * | | | | | pager.h: move declarations for pager.c functions from cache.h | Elijah Newren | 2023-04-11 | 1 | -0/+1 |
| * | | | | | object-file.h: move declarations for object-file.c functions from cache.h | Elijah Newren | 2023-04-11 | 1 | -0/+1 |
| * | | | | | object-name.h: move declarations for object-name.c functions from cache.h | Elijah Newren | 2023-04-11 | 1 | -0/+1 |
| * | | | | | treewide: be explicit about dependence on advice.h | Elijah Newren | 2023-04-11 | 1 | -0/+1 |
| * | | | | | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-... | Junio C Hamano | 2023-04-04 | 1 | -65/+85 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling' | Junio C Hamano | 2023-04-17 | 1 | -32/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase -m: fix serialization of strategy options | Phillip Wood | 2023-04-10 | 1 | -5/+6 |
| * | | | | | | | rebase -m: cleanup --strategy-option handling | Phillip Wood | 2023-04-10 | 1 | -1/+1 |
| * | | | | | | | sequencer: use struct strvec to store merge strategy options | Phillip Wood | 2023-04-10 | 1 | -27/+21 |
| * | | | | | | | rebase: stop reading and writing unnecessary strategy state | Phillip Wood | 2023-04-10 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'en/header-split-cleanup' | Junio C Hamano | 2023-04-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | wrapper.h: move declarations for wrapper.c functions from cache.h | Elijah Newren | 2023-03-21 | 1 | -0/+1 |
| * | | | | | | | abspath.h: move absolute path functions from cache.h | Elijah Newren | 2023-03-21 | 1 | -0/+1 |
| * | | | | | | | environment: move comment_line_char from cache.h | Elijah Newren | 2023-03-21 | 1 | -0/+1 |
| * | | | | | | | treewide: be explicit about dependence on gettext.h | Elijah Newren | 2023-03-21 | 1 | -0/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ab/remove-implicit-use-of-the-repository' | Junio C Hamano | 2023-04-06 | 1 | -65/+85 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | libs: use "struct repository *" argument, not "the_repository" | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -54/+48 |
| * | | | | | | post-cocci: adjust comments for recent repo_* migration | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -3/+3 |
| * | | | | | | cocci: apply the "pretty.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -4/+8 |