summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorLines
2022-07-22merge: fix save_state() to work when there are stat-dirty filesElijah Newren-0/+19
2022-07-22merge: do not abort early if one strategy fails to handle the mergeElijah Newren-3/+22
2022-07-22merge: abort if index does not match HEAD for trivial mergesElijah Newren-1/+36
2022-07-22merge-resolve: abort if index does not match HEADElijah Newren-0/+23
2022-07-22merge-ort-wrappers: make printed message match the one from recursiveElijah Newren-2/+2
2022-07-22builtin/cat-file.c: support NUL-delimited input with `-z`Taylor Blau-5/+72
2022-07-22t1006: extract --batch-command inputs to variablesTaylor Blau-14/+16
2022-07-22The sixth batchJunio C Hamano-1/+16
2022-07-22Merge branch 'rs/mingw-tighten-mkstemp'Junio C Hamano-4/+1
2022-07-22Merge branch 'js/ci-github-workflow-markup'Junio C Hamano-5/+5
2022-07-22Merge branch 'js/shortlog-sort-stably'Junio C Hamano-1/+1
2022-07-22Merge branch 'js/vimdiff-quotepath-fix'Junio C Hamano-4/+35
2022-07-22Merge branch 'gc/bare-repo-discovery'Junio C Hamano-56/+300
2022-07-22read-cache: make `do_read_index()` always set up `istate->repo`Martin Ă…gren-1/+9
2022-07-22Merge branch 'mt/checkout-count-fix' into mt/rot13-in-cJunio C Hamano-24/+113
2022-07-22pkt-line.h: move comment closer to the associated codeMatheus Tavares-8/+8
2022-07-21git-p4: refactoring of p4CmdList()Kilian Kilger-11/+42
2022-07-20builtin/remote.c: use the right kind of STRING_LIST_INITJunio C Hamano-2/+1
2022-07-20git-p4: fix error handling in P4Unshelve.renameBranch()Moritz Baumann-5/+2
2022-07-20git-p4: fix typo in P4Submit.applyCommit()Moritz Baumann-1/+1
2022-07-20git-p4: fix CR LF handling for utf16 filesMoritz Baumann-1/+1
2022-07-19The fifth batchJunio C Hamano-0/+24
2022-07-19Merge branch 'll/curl-accept-language'Junio C Hamano-8/+51
2022-07-19Merge branch 'jk/diff-files-cleanup-fix'Junio C Hamano-1/+1
2022-07-19Merge branch 'rs/cocci-array-copy'Junio C Hamano-42/+40
2022-07-19Merge branch 'jk/ref-filter-discard-commit-buffer'Junio C Hamano-0/+5
2022-07-19Merge branch 'jk/clone-unborn-confusion'Junio C Hamano-39/+117
2022-07-19Merge branch 'hx/lookup-commit-in-graph-fix'Junio C Hamano-1/+48
2022-07-19Merge branch 'jc/resolve-undo'Junio C Hamano-0/+146
2022-07-19compat/win32: correct for incorrect compiler warningDerrick Stolee-3/+4
2022-07-19sequencer: notify user of --update-refs activityDerrick Stolee-10/+67
2022-07-19sequencer: ignore HEAD ref under --update-refsDerrick Stolee-0/+13
2022-07-19rebase: add rebase.updateRefs config optionDerrick Stolee-0/+25
2022-07-19sequencer: rewrite update-refs as user edits todo listDerrick Stolee-0/+268
2022-07-19rebase: update refs from 'update-ref' commandsDerrick Stolee-18/+140
2022-07-19rebase: add --update-refs optionDerrick Stolee-0/+216
2022-07-19sequencer: add update-ref commandDerrick Stolee-1/+17
2022-07-19sequencer: define array with enum valuesDerrick Stolee-14/+14
2022-07-19rebase-interactive: update 'merge' descriptionDerrick Stolee-3/+3
2022-07-19branch: consider refs under 'update-refs'Derrick Stolee-0/+119
2022-07-19t2407: test branches currently using apply backendDerrick Stolee-1/+11
2022-07-19t2407: test bisect and rebase as black-boxesDerrick Stolee-26/+31
2022-07-19transport.c: avoid "whitelist"Derrick Stolee-4/+4
2022-07-19t: avoid "whitelist"Derrick Stolee-8/+7
2022-07-19git.txt: remove redundant languageDerrick Stolee-3/+1
2022-07-19git-cvsserver: clarify directory listDerrick Stolee-11/+12
2022-07-19daemon: clarify directory argumentsDerrick Stolee-14/+15
2022-07-19osx-keychain: fix compiler warningLessley Dennington-1/+1
2022-07-19contrib/rerere-train: avoid useless gpg sign in trainingCeleste Liu-1/+1
2022-07-19midx: reduce memory pressure while writing bitmapsDerrick Stolee-0/+13