summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'md/exclude-promisor-objects-fix'Junio C Hamano2018-11-063-0/+3
|\
| * exclude-promisor-objects: declare when option is allowedMatthew DeVore2018-10-233-0/+3
* | Merge branch 'nd/submodule-unused-vars'Junio C Hamano2018-11-061-1/+1
|\ \
| * | submodule.c: remove some of the_repository referencesNguyễn Thái Ngọc Duy2018-10-221-1/+1
* | | Merge branch 'sb/submodule-url-to-absolute'Junio C Hamano2018-11-061-17/+34
|\ \ \
| * | | submodule helper: convert relative URL to absolute URL if neededStefan Beller2018-10-181-17/+34
* | | | Merge branch 'js/shallow-and-fetch-prune'Junio C Hamano2018-11-062-1/+7
|\ \ \ \
| * | | | repack -ad: prune the list of shallow commitsJohannes Schindelin2018-10-251-0/+6
| * | | | shallow: offer to prune only non-existing entriesJohannes Schindelin2018-10-251-1/+1
| |/ / /
* | | | Merge branch 'js/remote-archive-dwimfix'Junio C Hamano2018-11-062-0/+4
|\ \ \ \
| * | | | archive: initialize archivers earlierJosh Steadmon2018-10-262-0/+4
| | |/ / | |/| |
* | | | rebase: apply cocci patchJunio C Hamano2018-11-021-1/+1
* | | | Merge branch 'js/rebase-autostash-fix'Junio C Hamano2018-11-021-3/+5
|\ \ \ \
| * | | | rebase --autostash: fix issue with dirty submodulesJohannes Schindelin2018-10-241-1/+1
| * | | | rebase (autostash): use an explicit OID to apply the stashJohannes Schindelin2018-10-231-0/+2
| * | | | rebase (autostash): store the full OID in <state-dir>/autostashJohannes Schindelin2018-10-231-1/+1
| * | | | rebase (autostash): avoid duplicate call to state_dir_path()Johannes Schindelin2018-10-231-1/+1
* | | | | Merge branch 'jc/rebase-in-c-5-test-typofix'Junio C Hamano2018-11-021-3/+3
|\ \ \ \ \
| * | | | | rebase: fix typoes in error messagesJunio C Hamano2018-10-111-3/+3
* | | | | | Merge branch 'pk/rebase-in-c-6-final'Junio C Hamano2018-11-021-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | rebase: default to using the builtin rebasePratik Karki2018-10-111-1/+1
* | | | | | Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'Junio C Hamano2018-11-021-4/+83
|\ \ \ \ \ \ | |/ / / / /
| * | | | | builtin rebase: prepare for builtin rebase -iJohannes Schindelin2018-10-111-4/+83
| * | | | | Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-cJunio C Hamano2018-10-112-88/+271
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge branch 'pk/rebase-in-c-5-test'Junio C Hamano2018-11-021-15/+135
|\ \ \ \ \ \ | |/ / / / /
| * | | | | builtin rebase: error out on incompatible option/mode combinationsPratik Karki2018-10-111-0/+41
| * | | | | builtin rebase: use no-op editor when interactive is "implied"Pratik Karki2018-10-111-0/+7
| * | | | | builtin rebase: show progress when connected to a terminalPratik Karki2018-10-111-0/+7
| * | | | | builtin rebase: fast-forward to onto if it is a proper descendantPratik Karki2018-10-111-0/+18
| * | | | | builtin rebase: optionally pass custom reflogs to reset_head()Pratik Karki2018-10-111-12/+21
| * | | | | builtin rebase: optionally auto-detect the upstreamPratik Karki2018-10-111-3/+41
* | | | | | Merge branch 'pk/rebase-in-c-4-opts'Junio C Hamano2018-11-022-85/+446
|\ \ \ \ \ \ | |/ / / / /
| * | | | | builtin rebase: support --rootPratik Karki2018-10-111-2/+29
| * | | | | builtin rebase: add support for custom merge strategiesPratik Karki2018-10-111-0/+57
| * | | | | builtin rebase: support `fork-point` optionPratik Karki2018-10-111-0/+11
| * | | | | merge-base --fork-point: extract libified functionPratik Karki2018-10-111-75/+6
| * | | | | builtin rebase: support --rebase-merges[=[no-]rebase-cousins]Pratik Karki2018-10-111-0/+21
| * | | | | builtin rebase: support `--allow-empty-message` optionPratik Karki2018-10-111-0/+7
| * | | | | builtin rebase: support `--exec`Pratik Karki2018-10-111-0/+18
| * | | | | builtin rebase: support `--autostash` optionPratik Karki2018-10-111-8/+109
| * | | | | builtin rebase: support `-C` and `--whitespace=<type>`Pratik Karki2018-10-111-0/+23
| * | | | | builtin rebase: support `--gpg-sign` optionPratik Karki2018-10-111-0/+28
| * | | | | builtin rebase: support `--autosquash`Pratik Karki2018-09-061-0/+10
| * | | | | builtin rebase: support `keep-empty` optionPratik Karki2018-09-061-0/+24
| * | | | | builtin rebase: support `ignore-date` optionPratik Karki2018-09-061-0/+8
| * | | | | builtin rebase: support `ignore-whitespace` optionPratik Karki2018-09-061-0/+6
| * | | | | builtin rebase: support --committer-date-is-author-datePratik Karki2018-09-061-0/+10
| * | | | | builtin rebase: support --rerere-autoupdatePratik Karki2018-09-061-0/+25
| * | | | | builtin rebase: support --signoffPratik Karki2018-09-061-0/+17
| * | | | | builtin rebase: allow selecting the rebase "backend"Pratik Karki2018-09-061-0/+37
View Lorry Controller Status