summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-03-02Merge branch 'en/t3433-rebase-stat-dirty-failure'Libravatar Junio C Hamano2-2/+53
2020-03-02Merge branch 'en/rebase-backend'Libravatar Junio C Hamano25-277/+693
2020-03-02Merge branch 'en/check-ignore'Libravatar Junio C Hamano3-19/+35
2020-03-02Merge branch 'jk/object-filter-with-bitmap'Libravatar Junio C Hamano14-70/+511
2020-03-02Merge branch 'jk/push-option-doc-markup-fix'Libravatar Junio C Hamano1-2/+2
2020-03-02Merge branch 'jk/doc-diff-parallel'Libravatar Junio C Hamano1-1/+1
2020-02-25The seventh batch for 2.26Libravatar Junio C Hamano1-0/+8
2020-02-25Merge branch 'es/doc-mentoring'Libravatar Junio C Hamano1-0/+36
2020-02-25Merge branch 'es/bright-colors'Libravatar Junio C Hamano3-22/+69
2020-02-25Merge branch 'bw/remote-rename-update-config'Libravatar Junio C Hamano12-90/+305
2020-02-19merge-recursive: fix the refresh logic in update_file_flagsLibravatar Elijah Newren2-3/+6
2020-02-19t3433: new rebase testcase documenting a stat-dirty-like failureLibravatar Elijah Newren1-0/+48
2020-02-18check-ignore: fix documentation and implementation to matchLibravatar Elijah Newren3-19/+35
2020-02-18doc-diff: use single-colon rule in rendering MakefileLibravatar Jeff King1-1/+1
2020-02-18doc/config/push: use longer "--" line for preformatted exampleLibravatar Jeff King1-2/+2
2020-02-18rev-list --count: comment on the use of count_right++Libravatar Junio C Hamano1-0/+7
2020-02-17The sixth batch for 2.26Libravatar Junio C Hamano1-29/+15
2020-02-17Merge branch 'es/outside-repo-errmsg-hints'Libravatar Junio C Hamano2-2/+4
2020-02-17Merge branch 'jk/doc-credential-helper'Libravatar Junio C Hamano2-91/+88
2020-02-17Merge branch 'js/mingw-open-in-gdb'Libravatar Junio C Hamano2-0/+23
2020-02-17Merge branch 'js/test-unc-fetch'Libravatar Junio C Hamano1-0/+12
2020-02-17Merge branch 'js/test-avoid-pipe'Libravatar Junio C Hamano2-6/+10
2020-02-17Merge branch 'js/test-write-junit-xml-fix'Libravatar Junio C Hamano1-1/+2
2020-02-17Merge branch 'jk/mailinfo-cleanup'Libravatar Junio C Hamano2-25/+52
2020-02-17Merge branch 'mr/show-config-scope'Libravatar Junio C Hamano10-139/+248
2020-02-17Merge branch 'rs/strbuf-insertstr'Libravatar Junio C Hamano11-15/+26
2020-02-17Merge branch 'rs/parse-options-concat-dup'Libravatar Junio C Hamano2-26/+18
2020-02-17Merge branch 'bc/hash-independent-tests-part-8'Libravatar Junio C Hamano46-279/+1817
2020-02-17Merge branch 'rs/name-rev-memsave'Libravatar Junio C Hamano1-64/+127
2020-02-16Sync with 2.25.1Libravatar Junio C Hamano1-0/+55
2020-02-16Git 2.25.1Libravatar Junio C Hamano3-2/+57
2020-02-16rebase: rename the two primary rebase backendsLibravatar Elijah Newren18-168/+166
2020-02-16rebase: change the default backend from "am" to "merge"Libravatar Elijah Newren4-8/+22
2020-02-16rebase: make the backend configurable via config settingLibravatar Elijah Newren2-7/+32
2020-02-16rebase tests: repeat some tests using the merge backend instead of amLibravatar Elijah Newren2-4/+26
2020-02-16rebase tests: mark tests specific to the am-backend with --amLibravatar Elijah Newren11-53/+53
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesLibravatar Elijah Newren3-10/+10
2020-02-16git-prompt: change the prompt for interactive-based rebasesLibravatar Elijah Newren2-9/+5
2020-02-16rebase: add an --am optionLibravatar Elijah Newren2-2/+27
2020-02-16rebase: move incompatibility checks between backend options a bit earlierLibravatar Elijah Newren1-11/+11
2020-02-16git-rebase.txt: add more details about behavioral differences of backendsLibravatar Elijah Newren1-5/+80
2020-02-16rebase: allow more types of rebases to fast-forwardLibravatar Elijah Newren2-4/+16
2020-02-16t3432: make these tests work with either am or merge backendsLibravatar Elijah Newren1-26/+22
2020-02-16rebase: fix handling of restrict_revisionLibravatar Elijah Newren2-3/+21
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerLibravatar Elijah Newren2-2/+9
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingLibravatar Elijah Newren2-8/+4
2020-02-16t3406: simplify an already simple testLibravatar Elijah Newren1-5/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyLibravatar Elijah Newren6-23/+183
2020-02-16rebase (interactive-backend): make --keep-empty the defaultLibravatar Elijah Newren9-55/+126
2020-02-16prefix_path: show gitdir when arg is outside repoLibravatar Emily Shaffer2-2/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:37:16 +0000