summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* diff: align move detection error handling with other optionsStefan Beller2018-11-143-10/+36
* Merge branch 'jc/http-curlver-warnings'Junio C Hamano2018-11-021-4/+2
|\
| * http: give curl version warnings consistentlyJunio C Hamano2018-10-261-4/+2
* | Merge branch 'js/mingw-http-ssl'Junio C Hamano2018-11-022-1/+91
|\|
| * http: when using Secure Channel, ignore sslCAInfo by defaultJohannes Schindelin2018-10-262-1/+26
| * http: add support for disabling SSL revocation checks in cURLBrendan Forster2018-10-262-0/+25
| * http: add support for selecting SSL backends at runtimeJohannes Schindelin2018-10-162-0/+40
* | Merge branch 'mg/gpg-fingerprint'Junio C Hamano2018-11-025-18/+70
|\ \
| * | gpg-interface.c: obtain primary key fingerprint as wellMichał Górny2018-10-234-1/+22
| * | gpg-interface.c: support getting key fingerprint via %GF formatMichał Górny2018-10-235-7/+31
| * | gpg-interface.c: use flags to determine key/signer info presenceMichał Górny2018-10-231-10/+17
* | | Merge branch 'mg/gpg-parse-tighten'Junio C Hamano2018-11-022-29/+87
|\| |
| * | gpg-interface.c: detect and reject multiple signatures on commitsMichał Górny2018-10-222-29/+87
| |/
* | Merge branch 'en/merge-cleanup-more'Junio C Hamano2018-11-022-7/+37
|\ \
| * | merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren2018-10-182-5/+35
| * | merge-recursive: improve auto-merging messages with path collisionsElijah Newren2018-10-181-2/+2
* | | Eighth batch for 2.20Junio C Hamano2018-11-021-0/+6
* | | rebase: apply cocci patchJunio C Hamano2018-11-021-1/+1
* | | Merge branch 'js/rebase-i-shortopt'Junio C Hamano2018-11-023-3/+6
|\ \ \
| * | | rebase -i: recognize short commands without argumentsJohannes Sixt2018-10-263-3/+6
* | | | Merge branch 'js/rebase-i-break'Junio C Hamano2018-11-025-3/+40
|\| | |
| * | | rebase -i: introduce the 'break' commandJohannes Schindelin2018-10-125-2/+37
| * | | rebase -i: clarify what happens on a failed `exec`Johannes Schindelin2018-10-111-1/+2
* | | | Merge branch 'js/rebase-autostash-fix'Junio C Hamano2018-11-022-3/+15
|\ \ \ \
| * | | | rebase --autostash: fix issue with dirty submodulesJohannes Schindelin2018-10-242-2/+2
| * | | | rebase --autostash: demonstrate a problem with dirty submodulesJohannes Schindelin2018-10-241-0/+10
| * | | | 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 'cb/printf-empty-format'Junio C Hamano2018-11-021-1/+1
|\ \ \ \ \
| * | | | | sequencer: cleanup for gcc warning in non developer modeCarlo Marcelo Arenas Belón2018-10-271-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-1117-449/+740
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
* | | | | 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-024-85/+530
|\| | | |
| * | | | 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-113-75/+89
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 14:37:22 +0100