aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* second 0th batch of topics from the previous cycleHEADmastermainGravatar Junio C Hamano 7 days1-0/+16
* Merge branch 'rs/commit-summary-wo-break-rewrite'Gravatar Junio C Hamano 7 days2-1/+31
|\
| * commit, sequencer: turn off break_opt for commit summaryGravatar René Scharfe 2022-04-062-1/+31
* | Merge branch 'pw/test-malloc-with-sanitize-address'Gravatar Junio C Hamano 7 days2-3/+7
|\ \
| * | tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECKGravatar Phillip Wood 2022-04-112-3/+7
* | | Merge branch 'ea/rebase-code-simplify'Gravatar Junio C Hamano 7 days1-4/+2
|\ \ \
| * | | rebase: simplify an assignment of options.type in cmd_rebaseGravatar Edmundo Carmona Antoranz 2022-04-201-4/+2
* | | | Merge branch 'kt/commit-graph-plug-fp-leak-on-error'Gravatar Junio C Hamano 7 days1-3/+6
|\ \ \ \
| * | | | commit-graph: close file before returning NULLGravatar Kleber Tarcísio 2022-04-201-3/+6
* | | | | Merge branch 'ah/rebase-keep-base-fix'Gravatar Junio C Hamano 7 days3-29/+60
|\ \ \ \ \
| * | | | | rebase: use correct base for --keep-base when a branch is givenGravatar Alex Henrie 2022-04-213-29/+60
| |/ / / /
* | | | | Merge branch 'master' of git://git.ozlabs.org/~paulus/gitkGravatar Junio C Hamano 8 days1-7/+10
|\ \ \ \ \
| * | | | | gitk: include y coord in recorded sash positionGravatar halilsen 8 days1-0/+3
| * | | | | gitk: trivial indentation fixGravatar halilsen 8 days1-7/+7
* | | | | | 0th batch for topics from the previous cycleGravatar Junio C Hamano 8 days1-1/+22
* | | | | | Merge branch 'ea/progress-partial-blame'Gravatar Junio C Hamano 8 days2-1/+45
|\ \ \ \ \ \
| * | | | | | blame: report correct number of lines in progress when using rangesGravatar Edmundo Carmona Antoranz 2022-04-062-1/+45
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fr/vimdiff-layout'Gravatar Junio C Hamano 8 days27-32/+978
|\ \ \ \ \ \
| * | | | | | mergetools: add description to all diff/merge toolsGravatar Fernando Ramos 2022-04-0320-0/+160
| * | | | | | vimdiff: add tool documentationGravatar Fernando Ramos 2022-04-036-5/+277
| * | | | | | vimdiff: integrate layout tests in the unit tests framework ('t' folder)Gravatar Fernando Ramos 2022-03-301-0/+14
| * | | | | | vimdiff: new implementation with layout supportGravatar Fernando Ramos 2022-03-301-29/+529
* | | | | | | Merge branch 'jh/p4-various-fixups'Gravatar Junio C Hamano 8 days1-357/+525
|\ \ \ \ \ \ \
| * | | | | | | git-p4: sort importsGravatar Joel Holdsworth 2022-04-011-8/+10
| * | | | | | | git-p4: seperate multiple statements onto seperate linesGravatar Joel Holdsworth 2022-04-011-2/+5
| * | | | | | | git-p4: move inline comments to line aboveGravatar Joel Holdsworth 2022-04-011-3/+7
| * | | | | | | git-p4: only seperate code blocks by a single empty lineGravatar Joel Holdsworth 2022-04-011-3/+0
| * | | | | | | git-p4: compare to singletons with "is" and "is not"Gravatar Joel Holdsworth 2022-04-011-3/+3
| * | | | | | | git-p4: normalize indentation of lines in conditionalsGravatar Joel Holdsworth 2022-04-011-9/+7
| * | | | | | | git-p4: ensure there is a single space around all operatorsGravatar Joel Holdsworth 2022-04-011-5/+5
| * | | | | | | git-p4: ensure every comment has a single #Gravatar Joel Holdsworth 2022-04-011-6/+6
| * | | | | | | git-p4: remove spaces between dictionary keys and colonsGravatar Joel Holdsworth 2022-04-011-7/+7
| * | | | | | | git-p4: remove redundant backslash-continuations inside bracketsGravatar Joel Holdsworth 2022-04-011-9/+9
| * | | | | | | git-p4: remove extraneous spaces before function argumentsGravatar Joel Holdsworth 2022-04-011-11/+11
| * | | | | | | git-p4: place a single space after every commaGravatar Joel Holdsworth 2022-04-011-9/+9
| * | | | | | | git-p4: removed brackets when assigning multiple return valuesGravatar Joel Holdsworth 2022-04-011-19/+19
| * | | | | | | git-p4: remove spaces around default argumentsGravatar Joel Holdsworth 2022-04-011-6/+6
| * | | | | | | git-p4: remove padding from lists, tuples and function argumentsGravatar Joel Holdsworth 2022-04-011-18/+18
| * | | | | | | git-p4: sort and de-duplcate pylint disable listGravatar Joel Holdsworth 2022-04-011-7/+22
| * | | | | | | git-p4: remove commented codeGravatar Joel Holdsworth 2022-04-011-7/+0
| * | | | | | | git-p4: convert descriptive class and function comments into docstringsGravatar Joel Holdsworth 2022-04-011-70/+94
| * | | | | | | git-p4: improve consistency of docstring formattingGravatar Joel Holdsworth 2022-04-011-133/+158
| * | | | | | | git-p4: indent with 4-spacesGravatar Joel Holdsworth 2022-04-011-9/+9
| * | | | | | | git-p4: remove unneeded semicolons from statementsGravatar Joel Holdsworth 2022-04-011-14/+14
| * | | | | | | git-p4: add blank lines between functions and class definitionsGravatar Joel Holdsworth 2022-04-011-0/+107
* | | | | | | | Merge branch 'tk/untracked-cache-with-uall'Gravatar Junio C Hamano 8 days2-16/+185
|\ \ \ \ \ \ \ \
| * | | | | | | | untracked-cache: support '--untracked-files=all' if configuredGravatar Tao Klerks 2022-04-012-16/+153
| * | | | | | | | untracked-cache: test untracked-cache-bypassing behavior with -uallGravatar Tao Klerks 2022-04-011-0/+32
* | | | | | | | | Merge branch 'ab/misc-cleanup'Gravatar Junio C Hamano 8 days9-52/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | alloc.[ch]: remove alloc_report() functionGravatar Ævar Arnfjörð Bjarmason 2022-04-012-22/+0