summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-07-16t9814: simplify convoluted check that command correctly errors outLibravatar Eric Sunshine1-15/+3
2018-07-16t9001: fix broken "invoke hook" testLibravatar Eric Sunshine1-2/+2
2018-07-16t7810: use test_expect_code() instead of hand-rolled comparisonLibravatar Eric Sunshine1-4/+3
2018-07-16t7400: fix broken "submodule add/reconfigure --force" testLibravatar Eric Sunshine1-5/+6
2018-07-16vcbuild/README: update to accommodate for missing common-cmds.hLibravatar Johannes Schindelin1-2/+2
2018-07-16pretty: switch hard-coded constants to the_hash_algoLibravatar brian m. carlson1-2/+2
2018-07-16sha1-file: convert constants to uses of the_hash_algoLibravatar brian m. carlson1-4/+4
2018-07-16log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexszLibravatar brian m. carlson1-1/+1
2018-07-16diff: switch GIT_SHA1_HEXSZ to use the_hash_algoLibravatar brian m. carlson1-3/+3
2018-07-16builtin/merge-recursive: make hash independentLibravatar brian m. carlson1-2/+2
2018-07-16builtin/merge: switch to use the_hash_algoLibravatar brian m. carlson1-5/+6
2018-07-16builtin/fmt-merge-msg: make hash independentLibravatar brian m. carlson1-9/+10
2018-07-16builtin/update-index: simplify parsing of cacheinfoLibravatar brian m. carlson1-2/+3
2018-07-16builtin/update-index: convert to using the_hash_algoLibravatar brian m. carlson1-4/+5
2018-07-16refs/files-backend: use the_hash_algo for writing refsLibravatar brian m. carlson1-2/+2
2018-07-16sha1-name: use the_hash_algo when parsing object namesLibravatar brian m. carlson1-5/+7
2018-07-16strbuf: allocate space with GIT_MAX_HEXSZLibravatar brian m. carlson1-1/+1
2018-07-16commit: express tree entry constants in terms of the_hash_algoLibravatar brian m. carlson1-2/+2
2018-07-16hex: switch to using the_hash_algoLibravatar brian m. carlson1-3/+3
2018-07-16tree-walk: replace hard-coded constants with the_hash_algoLibravatar brian m. carlson1-1/+2
2018-07-16cache: update object ID functions for the_hash_algoLibravatar brian m. carlson1-3/+3
2018-07-16blame: prefer xsnprintf to strcpy for colorsLibravatar Jeff King1-1/+3
2018-07-16sequencer: use configured comment characterLibravatar Aaron Schrab1-1/+1
2018-07-16fsck: downgrade gitmodulesParse default to "info"Libravatar Jeff King2-2/+2
2018-07-16fsck: split ".gitmodules too large" error from parse failureLibravatar Jeff King1-1/+2
2018-07-16coccinelle: update commit.cocciLibravatar Derrick Stolee1-1/+1
2018-07-12t3404: fix use of "VAR=VAL cmd" with a shell functionLibravatar Junio C Hamano1-1/+8
2018-07-12handle lower case drive letters on WindowsLibravatar Ben Peart1-2/+2
2018-07-12sha1-name.c: for ":/", find detached HEAD commitsLibravatar William Chargin3-1/+29
2018-07-12t6036: fix broken && chain in sub-shellLibravatar Ramsay Jones1-1/+1
2018-07-12t/lib-httpd: avoid occasional failures when checking access.logLibravatar SZEDER Gábor4-8/+16
2018-07-12t/lib-httpd: add the strip_access_log() helper functionLibravatar SZEDER Gábor4-24/+13
2018-07-12t5541: clean up truncating access logLibravatar SZEDER Gábor1-8/+4
2018-07-11rebase --rebase-merges: adjust man page for octopus supportLibravatar Johannes Schindelin1-3/+4
2018-07-11rebase --rebase-merges: add support for octopus mergesLibravatar Johannes Schindelin2-43/+159
2018-07-11merge: allow reading the merge commit message from a fileLibravatar Johannes Schindelin2-1/+41
2018-07-11has_uncommitted_changes(): fall back to empty treeLibravatar Jeff King3-0/+25
2018-07-11gpg-interface: make parse_gpg_output static and remove from interface headerLibravatar Henning Schild2-3/+1
2018-07-11builtin/receive-pack: use check_signature from gpg-interfaceLibravatar Henning Schild1-15/+2
2018-07-11t7405: verify 'merge --abort' works after submodule/path conflictsLibravatar Elijah Newren1-0/+31
2018-07-11t7405: add a directory/submodule conflictLibravatar Elijah Newren1-0/+88
2018-07-11t7405: add a file/submodule conflictLibravatar Elijah Newren1-0/+54
2018-07-11merge: fix misleading pre-merge check documentationLibravatar Elijah Newren1-3/+3
2018-07-11merge-recursive: enforce rule that index matches head before mergingLibravatar Elijah Newren4-137/+18
2018-07-11t6044: add more testcases with staged changes before a merge is invokedLibravatar Elijah Newren1-0/+29
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADLibravatar Elijah Newren5-13/+21
2018-07-11merge-recursive: make sure when we say we abort that we actually abortLibravatar Elijah Newren2-3/+3
2018-07-11t6044: add a testcase for index matching head, when head doesn't match HEADLibravatar Elijah Newren1-0/+11
2018-07-11unpack-trees: do not fail reset because of unmerged skipped entryLibravatar Max Kirillov2-1/+60
2018-07-11t6036: add a failed conflict detection case: regular files, different modesLibravatar Elijah Newren1-0/+67