summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-10-12diff.c: pass sign_index to emit_line_ws_markupLibravatar Stefan Beller1-7/+5
2018-10-12rebase -i: introduce the 'break' commandLibravatar Johannes Schindelin5-2/+37
2018-10-12git-p4: do not fail in verbose mode for missing 'fileSize' keyLibravatar Luke Diamand1-1/+4
2018-10-12log: fix coloring of certain octopus merge shapesLibravatar Noam Postavsky2-15/+145
2018-10-12doc: move git-cherry to plumbingLibravatar Daniels Umanovskis2-12/+1
2018-10-12doc: move git-get-tar-commit-id to plumbingLibravatar Daniels Umanovskis1-1/+1
2018-10-12split-index: BUG() when cache entry refers to non-existing shared entryLibravatar SZEDER Gábor1-2/+2
2018-10-12split-index: smudge and add racily clean cache entries to split indexLibravatar SZEDER Gábor4-8/+46
2018-10-12split-index: don't compare cached data of entries already marked for split indexLibravatar SZEDER Gábor1-17/+72
2018-10-12split-index: count the number of deleted entriesLibravatar SZEDER Gábor1-1/+1
2018-10-12t1700-split-index: date back files to avoid racy situationsLibravatar SZEDER Gábor1-21/+28
2018-10-12split-index: add tests to demonstrate the racy split index problemLibravatar SZEDER Gábor1-0/+218
2018-10-11rebase -i: clarify what happens on a failed `exec`Libravatar Johannes Schindelin1-1/+2
2018-10-11doc: move git-rev-parse from porcelain to plumbingLibravatar Daniels Umanovskis1-1/+1
2018-10-11gc doc: mention the commit-graph in the introLibravatar Ævar Arnfjörð Bjarmason1-1/+2
2018-10-11read-cache: load cache entries on worker threadsLibravatar Ben Peart1-37/+193
2018-10-11ieot: add Index Entry Offset Table (IEOT) extensionLibravatar Ben Peart2-3/+211
2018-10-11read-cache: load cache extensions on a worker threadLibravatar Ben Peart1-16/+79
2018-10-11config: add new index.threads config settingLibravatar Ben Peart5-0/+36
2018-10-11eoie: add End of Index Entry (EOIE) extensionLibravatar Ben Peart3-12/+177
2018-10-11read-cache: clean up casting and byte decodingLibravatar Ben Peart1-12/+11
2018-10-11send-email: only consider lines containing @ or <> for automatic Cc'ingLibravatar Rasmus Villemoes1-0/+5
2018-10-11Documentation/git-send-email.txt: style fixesLibravatar Rasmus Villemoes1-4/+4
2018-10-11rebase: fix typoes in error messagesLibravatar Junio C Hamano1-3/+3
2018-10-11rebase: default to using the builtin rebaseLibravatar Pratik Karki1-1/+1
2018-10-11builtin rebase: prepare for builtin rebase -iLibravatar Johannes Schindelin1-4/+83
2018-10-11Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-cLibravatar Junio C Hamano17-449/+740
2018-10-11builtin rebase: error out on incompatible option/mode combinationsLibravatar Pratik Karki1-0/+41
2018-10-11builtin rebase: use no-op editor when interactive is "implied"Libravatar Pratik Karki1-0/+7
2018-10-11builtin rebase: show progress when connected to a terminalLibravatar Pratik Karki1-0/+7
2018-10-11builtin rebase: fast-forward to onto if it is a proper descendantLibravatar Pratik Karki1-0/+18
2018-10-11builtin rebase: optionally pass custom reflogs to reset_head()Libravatar Pratik Karki1-12/+21
2018-10-11builtin rebase: optionally auto-detect the upstreamLibravatar Pratik Karki1-3/+41
2018-10-11builtin rebase: support --rootLibravatar Pratik Karki1-2/+29
2018-10-11builtin rebase: add support for custom merge strategiesLibravatar Pratik Karki1-0/+57
2018-10-11builtin rebase: support `fork-point` optionLibravatar Pratik Karki1-0/+11
2018-10-11merge-base --fork-point: extract libified functionLibravatar Pratik Karki3-75/+89
2018-10-11builtin rebase: support --rebase-merges[=[no-]rebase-cousins]Libravatar Pratik Karki1-0/+21
2018-10-11builtin rebase: support `--allow-empty-message` optionLibravatar Pratik Karki1-0/+7
2018-10-11builtin rebase: support `--exec`Libravatar Pratik Karki1-0/+18
2018-10-11builtin rebase: support `--autostash` optionLibravatar Pratik Karki1-8/+109
2018-10-11builtin rebase: support `-C` and `--whitespace=<type>`Libravatar Pratik Karki1-0/+23
2018-10-11builtin rebase: support `--gpg-sign` optionLibravatar Pratik Karki1-0/+28
2018-10-11git-help.txt: document "git help cmd" vs "git cmd --help" for aliasesLibravatar Rasmus Villemoes1-0/+4
2018-10-11git.c: handle_alias: prepend alias info when first argument is -hLibravatar Rasmus Villemoes1-0/+3
2018-10-11help: redirect to aliased commands for "git cmd --help"Libravatar Rasmus Villemoes1-3/+31
2018-10-11doc: fix a typo and clarify a sentenceLibravatar Mihir Mehta2-3/+3
2018-10-10Third batch for 2.20Libravatar Junio C Hamano1-0/+16
2018-10-10Merge branch 'ab/fsck-skiplist'Libravatar Junio C Hamano6-45/+171
2018-10-10Merge branch 'ds/multi-pack-verify'Libravatar Junio C Hamano6-20/+262